shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,923 Commits 5 Branches 0 Tags
c5ae1bf17e82cd66d8ee0f085bbbd865f514b5cf
Commit Graph

181 Commits

Author SHA1 Message Date
SandPoot
c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
Jerry Wester
31e87bc2d7 Safeguard suit 2023-05-01 00:26:56 -05:00
Jerry Wester
22309324dc whitespace should not be syntax grrr 2023-05-01 00:23:09 -05:00
Jerry Wester
8271cf9bc1 move rescue plating to CMO locker 2023-05-01 00:22:59 -05:00
KrissKr0ss
66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits" 
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
 2023-05-01 00:16:20 -05:00
Jerry Wester
ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
Jerry Wester
b1b4f96053 fix hilbert analyzer in RD locker 2022-12-17 20:10:41 -07:00
Jerry Wester
94bfa88ed9 add more platings 2022-12-13 19:14:43 -07:00
TrojanCoyote
9f37ed4d35 Update code/game/objects/structures/crates_lockers/closets/secure/security.dm 
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
 2022-06-10 19:27:14 -05:00
TrojanCoyote
b4aa87431b swap things around 
tosses plate carrier into HoS locker, out of loadout options <3
 2022-06-10 19:17:25 -05:00
SandPoot
695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
DeltaFire
6aa906395c not a gaius reference 
hhhh let me just replace all the ex_acts missing some args and adjust them
 2021-11-14 21:34:59 +01:00
zerothebigboy
68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners 2021-09-10 12:12:57 -04:00
zerothebigboy
3c23a09b56 bannedforbeingcringeist 2021-09-07 21:10:24 -04:00
keronshb
ea3b248e6c Ports Parade outfit changes 2021-09-05 14:17:52 -04:00
qweq12yt
0ca61af62a fixed combo lockers 2021-06-10 16:50:44 -03:00
qweq12yt
04f90b749f fixes material crates not shipping 2021-03-30 12:33:23 -03:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
SiliconMain
cccb547a72 Update engineering.dm 2021-01-13 23:41:49 -06:00
SiliconMain
2d3e24fee4 Update engineering.dm 2021-01-12 14:43:54 -06:00
Chiirno
35896e92ec Paramedic office added and operating room remodeled 2020-12-22 21:50:22 -04:00
shellspeed1
3735efbfca Ports construction bags 2020-11-29 18:29:03 -08:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
Detective Google
c4480afc09 Adds a bunch of RP clothes and ports the detvendor 2020-09-30 20:50:00 -05:00
Letter N
116145872f commit thing, need to see changies but gitlens is denying me 2020-08-29 14:00:46 +08:00
Letter N
f04918bdca working code? 2020-08-21 15:09:49 +08:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Ghommie
495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02:00
Ghommie
1a9484cf2e Fixing missing clothing icons etc. 2020-06-02 17:43:31 +02:00
Ghommie
9a9e76664f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 22:47:13 +02:00
Chayse Ramsay
f95222fee0 For the stranger there among them had a big iron on his hip. Big iron on his hiiiiiiip. (#12155) 
* HoS modular revolver, ported from vore

* Bugfixing, sanity checks etc.

* Update hos.dm

* Sprite fixed

* Automatic changelog compile [ci skip]

* HoS Weapon Selection

* Icons

* Clamp fix, removing rogue items from ye olde list

* Update ammo.dmi

* Requested Changes Part 1

* Beacon fixed (kind of)

* Subtypes fix

* User

* Giving process_chamber a user so that the proc can use to_chat without requiring loc, fixes switching so the gun only switches to the same type when empty

* redundant item

* Adds an examine notice on how to remove the magazine

* Requested Changes

* Icons

Co-authored-by: Changelogs <action@github.com>
 2020-05-30 03:17:56 +02:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
ZeroMan
18eb42315e i missed a src 2020-04-28 02:55:25 -04:00
ZeroMan
8dc130175d i actually despise coding 2020-04-28 02:46:46 -04:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Lin
5ee4a355c1 Merge pull request #11178 from Citadel-Station-13/Ghommie-patch-2 
Fixing refrigerators locking when closed
 2020-02-29 00:21:43 -06:00
kevinz000
59e95555bb Merge remote-tracking branch 'citadel/master' into staves 2020-02-24 13:09:45 -07:00
Ghom
503214dee6 Update freezer.dm 2020-02-21 02:26:52 +01:00
Ghom
89f256866d Merge pull request #11033 from kevinz000/cmo_drapes 
gives CMO special surgery drapes that can initiate techweb surgeries without operating console
 2020-02-20 11:24:50 +01:00
kevinz000
8666a36b1e fixes most things 2020-02-18 02:24:31 -07:00
kevinz000
d7949e810e Merge remote-tracking branch 'citadel/master' into staves 2020-02-18 02:20:58 -07:00
kevinz000
70e752dbc9 this is totally not laggy 2020-02-11 23:45:22 -07:00
ShadeAware
bbedf617f5 Declutters the Locker 2020-02-11 17:33:18 -05:00
kevinz000
8556bcf2b3 compile 2020-02-03 13:36:10 -07:00
kevinz000
3e30c9409b riot staves 2020-02-03 13:11:26 -07:00
Ghom
d709edb1c2 Merge pull request #10578 from r4d6/Mining 
Port TG's Mining changes
 2020-01-18 20:32:14 +01:00