juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,034 Commits 57 Branches 0 Tags
506f32f866eb6de044dd301f50737da9f5489d16
Commit Graph

142 Commits

Author SHA1 Message Date
Moony
88df8732b3 Pull origin due to undocumented changes. (#12606) 2022-11-14 23:12:32 -06:00
brainfood1183
4a3b45906b update to origin (#12430) 2022-11-06 22:21:08 -06:00
Rane
88186f2106 Map pool cvar (#12313) 
* it just works

* nuke votable

* whoops
 2022-11-01 20:17:35 -05:00
Moony
40dead40cb Remove split. (#12236) 
* Remove split.

(lemme finish the funny webedit rq)

* Delete split.yml
 2022-10-27 09:31:19 -05:00
brainfood1183
7d6fcfa959 New station map Origin (#11659) 
* new map origin

* new map origin

* Revert "new map origin"

This reverts commit 3d36679b921d058c7bc7ff7202086aea966c43a6.

* merge

* merge

* merge

* merge

* merge

* merge

* merge

* new update

* update map reduce lights

* slight update

* update

* push

* update
 2022-10-27 09:12:56 -05:00
Cheackraze
ab06650039 New Dart and removed jobs info (#12232) 2022-10-27 06:54:12 -05:00
Cheackraze
a512a77046 Zookeeper (#12020) 
* jumpsuit sprite

* hat and meta to match

* pda

* id card

* update spawner jobs.yml

* update identification_cards.yml

* Update pda.yml

* update jumpsuits.yml

* zookeeper job yml

* zookeeper icon

* update hats.yml

* woops fixed hats.yml

* fix id cards yml

* job spawner icon and json

* update map yml

* update departments yml

* job icon meta.json

* comes with the hat

* real

* real

* localization

* fix spawner jobs yml

* playtime tracker

* kettle spawn

* Revert "kettle spawn"

This reverts commit 37c241cb31a6f186f31a73f168a93649423e839a.

* kettle spawn

* service locked windoor

* updated sprites and updated meta.json thanks to EmoGarbage

* meta.json

* Update Resources/Textures/Objects/Devices/pda.rsi/meta.json

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Update Resources/Textures/Objects/Misc/id_cards.rsi/meta.json

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* credit to EmoGarbage404 and alphabetized

* license

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2022-10-23 14:42:25 -05:00
Scribbles0
1d2842ffae hope this is better (#11943) 2022-10-15 19:28:21 -05:00
Cheackraze
b224036a7a Kettle (#11762) 
* Added: Kettle Station

* Becomes Station

* fixed a firelock that had no power

* cans

* rotate out meta

* no reporter no fun
 2022-10-08 21:27:03 -05:00
metalgearsloth
b29eeb7c16 Fix gamemap name casing (#11474) 2022-10-04 14:33:14 +11:00
Emisse
9df067a0a1 packed qm (#11671) 2022-10-03 20:25:56 +11:00
Peptide90
9686ab4da7 Pillar fixes and update (#11496) 
* Pillar fixes and update

* ore machine, drozd ammo fix

* salvage moved back to cargo
 2022-09-26 14:35:41 -05:00
Peptide90
5bdc4cc9e3 Splitstation Fixes and Minor Update (#11499) 
* update and fixes for splitstation

* ore processor
 2022-09-24 16:48:39 -05:00
Peptide90
464f4853c9 NSS Pillar mk2 - New Pillar (#11200) 
* new pillar

* finished atmos etc

* misc changes
 2022-09-15 21:55:43 -05:00
Emisse
d79c879067 Omega (#11170) 
* Add files via upload

* Add files via upload
 2022-09-10 17:33:41 -05:00
20kdc
b76f88ccc5 Salvage spawning adjustments and AABBs in prototypes (#10789) 2022-08-31 19:25:05 -07:00
Nemanja
6b5be6a633 removed several unused maps from files (#10880) 2022-08-27 15:53:12 +10:00
metalgearsloth
69f93fc368 Remove delta and way (#10617) 2022-08-15 07:04:23 -07:00
Emisse
f25d9017d6 Meta Station (#10290) 
* Meta Station

* station component

* prototype

* fixe

* rotato

* cloner rework
 2022-08-04 12:54:27 -05:00
Nemanja
9f78370227 So long, Detroit. (#10276) 2022-08-04 09:44:11 +10:00
Morber
8a81496d62 Add BecomesStation to Empty map (#10167) 2022-07-30 22:42:59 +10:00
metalgearsloth
55692d4d71 Revert map PRs (#10079) 
* Revert "Fix Saltern cvar (#10077)"

This reverts commit 0f0420eca9.

* Revert "Map ID fixes (Take 2) (#10075)"

This reverts commit c15e14676d.
 2022-07-27 22:27:23 +10:00
Peptide90
c15e14676d Map ID fixes (Take 2) (#10075) 2022-07-27 03:13:55 -07:00
Emisse
3751ff59f8 warden (#10071) 2022-07-26 22:22:47 -05:00
Rane
e36b155325 Port boxer from Nyano (#9080) 2022-07-26 18:34:19 -07:00
Emisse
42b6ea20e1 Box Station (#10043) 
* box

* box

* Update box.yml

* Update box.yml

* emergency lights
 2022-07-26 05:26:31 -05:00
Moony
21342535c7 Update waystation.yml (#10024) 2022-07-25 21:41:05 -05:00
Emisse
c35252cc07 Packed Fixe (#9859) 2022-07-18 05:09:22 -07:00
Emisse
d135f16cf8 Packed In (#9760) 
* Update packedstation.yml

* Update atlas.yml

* packed...,,,

* packed..,,,
 2022-07-17 18:13:55 -05:00
OldDanceJacket
0b3a716e9f Lighthouse Update (#9368) 
* Add files via upload

* Add files via upload
 2022-07-02 19:34:51 -07:00
Emisse
c726041c19 Detective (#9301) 2022-07-01 20:10:50 -07:00
Peptide90
cadd4b0fbd Split QoL Update (#9303) 2022-06-30 11:45:37 -07:00
metalgearsloth
793f0e1281 Revert "Pillar update (#9126)" (#9255) 2022-06-29 00:29:36 +10:00
OldDanceJacket
bbf5976f00 Pillar update (#9126) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-28 23:44:40 +10:00
wrexbe
c97243413b Make centcomm unvotable (#9239) 2022-06-27 10:38:41 -07:00
LittleBuilderJane
6325a10a43 Adds the Central Command outpost for Roundend and ERT to spawn at. (#9146) 
* Adds Reach II

* Updated Reach II to work after refactor

* removing old map

* Adding the Central Command outpost

* Reachii isn't meant to be in here at all.

* updated possible error in .yml

* updating .yml

* Updated CentComm, fixed some issues like lighting.

* Imagine if we also docked at centcomm

* a

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-27 23:11:39 +10:00
OldDanceJacket
73f2f651d9 Split update (#9125) 2022-06-24 22:27:09 -07:00
OldDanceJacket
d271f32ea0 Lighthouse update (#9127) 2022-06-24 22:27:00 -07:00
OldDanceJacket
b4e0985d1f Lighthouse Playable (#9067) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-06-23 04:14:58 -07:00
OldDanceJacket
e5effc50a3 Lighthouse Station (#8650) 2022-06-23 00:21:06 -07:00
Emisse
5926d220ae Saltern Update 3.6 (#9047) 2022-06-23 14:09:36 +10:00
Emisse
54efbbc5b2 Derotate Moose Station (#9040) 2022-06-22 17:40:45 -07:00
Emisse
e4caedf031 Station Specific Jobs: Reporter and Psychologist (#8865) 
* Update jobs.yml

* Add files via upload

* id moment

* Update identification_cards.yml

* Update pda.yml

* Add files via upload

* psych

* roleyml psych

* real

* Update jumpsuits.yml

* Add files via upload

* Add files via upload

* Add files via upload

* Update jobs.yml

* Update meta.json

* Update meta.json

* Update meta.json

* Update bagel.yml

* Update marathon.yml

* job iconz

* Update meta.json
 2022-06-16 19:28:38 +10:00
Peptide90
f09cec77a9 ERT Update (#8617) 
* removes ert shuttle and adds dartv2 by Schiene

* missing headsets

* makes ghost role sentient

* fixes duplicating helmets

* culling

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-12 16:17:16 +10:00
Emisse
dbb9466309 Atlas: The Video Game (Update 2.0) (#8725) 2022-06-09 14:59:16 +10:00
Peptide90
b93286fc61 Emergency Response Team (#6258) 
* Clothing pass 1

Backpacks, hardsuits and helmets pass 1

* ERT Leader Role first pass

* ERT Backpacks (nearly there)

* ERT Backpacks final

* ERT helmets pass 1

* remaining hardsuit sprites added.

* ERT leader ID

* removed duplicates

* hardsuits + helmets entities

* ID + PDA for ERT

* ERT leader role pass 1

* job icons / markers for ERT

* military / ert name dataset

* starting gear pass 1 for ERT

* removed in favor of singular ERT roles file

* ERT mobs for spawning

* ERT spawn points added

* fixed case on ERT name

* Increased ERT access to most areas

* ERT ghost role takeover fixes

* ERT removed invalid parent

* path issue resolved

* more file path fixes

* fixes random naming pt 1

* Buffs ERT hardsuits and integrates helmet

parents ert to syndie hardsuit and adds toggleable helmet

* Adds suit storage slot and cargo access

* Adds backpack fills for ERT

* Updates ERT loadout for filled backpacks

+ other misc changes

* buff ERT backpack storage

* fixes ert jani backpack fills

* tweaks spawn loadout to EVA

* gave centcom official AA

* formatting

* ERT shuttle mapped with spawners

* update access
 2022-06-03 20:48:28 +10:00
metalgearsloth
fb943a61dc Gun refactor (#8301) 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: T-Stalker <le0nel_1van@hotmail.com>
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
 2022-06-01 19:59:58 +10:00
TimrodDX
72ed837cbe Waystation: The Station That Will Succeed Packed's Legacy (#8398) 
* Waystation: The Station That Will Succeed Packed's Legacy

* Hopefully fixes YAML errors

* Fixes missing HV wires

* Security door

* Addresses review

* Add station component to waystation

* Fix minor stuff

* BecomeStation Casing Weh

Co-authored-by: wrexbe <wrexbe@protonmail.com>
 2022-05-29 09:18:16 -07:00
Peptide90
04780fd837 Pillar update 090522 (#8386) 2022-05-25 19:35:25 +10:00
Peptide90
e064327464 Splitstation update and fixes (#8141) 2022-05-14 14:04:19 +10:00