shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,568 Commits 5 Branches 0 Tags
08f251a88c898ce3a635909512303170483694de
Commit Graph

164 Commits

Author SHA1 Message Date
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
r4d6
ce16c91b2f Code changes 2020-01-16 14:08:14 -05:00
Ghommie
9dad810edf Merge branch 'Ghommie-cit492' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit492 2020-01-12 23:11:02 +01:00
Ghommie
b2ab8959f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit492 2020-01-12 23:00:05 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghom
1a834edd5f f 2020-01-05 21:27:04 +01:00
Seris02
519d379cdf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atmosfirelock 2020-01-03 17:42:53 +08:00
KathrinBailey
243aebe12a dab 2x 2019-12-31 16:54:59 +00:00
KathrinBailey
0a19f62fa9 dab 2019-12-31 16:45:06 +00:00
KathrinBailey
f2e9ba2a8e Makes lockers into subtypes 
Adds new lockers cleanly at the bottom instead and as subtypes.
 2019-12-31 16:41:23 +00:00
KathrinBailey
283ccceb24 CE Locker Exodus: The Removaling 
Removes junk from the CE locker.
Adds empty engineering lockers.
I don't know how to do this as a child and not have populate contents fill the child.
 2019-12-30 09:25:03 +00:00
Ghommie
ffa013af6e Minor captains closet cleanup. 2019-12-25 03:59:21 +01:00
Seris02
61ab3685f1 atmos firelock, changes to temp blocking 2019-12-20 14:14:01 +08:00
Lin
6368f04f2d Merge pull request #10044 from Ghommie/Ghommie-cit423 
Made wooden cabinet/closets... actually made of wood.
 2019-12-08 22:18:15 +00:00
Ghommie
3f0d1e275e Made wooden cabinet/closets... actually made of wood. 2019-12-04 18:27:17 +01:00
TrilbySpaceClone
e1717bb534 Merge branch 'master' into crow 2019-12-03 23:45:05 -05:00
Lin
b501321362 Merge pull request #9941 from Putnam3145/personal-closet-fix 
Personal closets can use PDAs/tablets now
 2019-12-03 01:38:42 +00:00
Putnam
66d1b88725 Get 2019-11-25 22:23:50 -08:00