shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,457 Commits 5 Branches 0 Tags
65729cdd559df021eb40f0a465a33ef92ef3588a
Commit Graph

679 Commits

Author SHA1 Message Date
CitadelStationBot
9acc4da365 [MIRROR] Curator starts with the key to the display cases instead of being the key (#763) 
*  Curator starts with the key to the display cases instead of being the key

* Update displaycase.dm

* Delete displaycase.dm.rej

* Delete civilian.dm.rej

* Update civilian.dm

* fuck line endings

* define true/false
 2017-05-08 00:25:59 -07:00
CitadelStationBot
a6cb12b84a [MIRROR] Plastic golems (#806) 
* Plastic golems

* Update lavaland_ruin_code.dm

* Delete lavaland_ruin_code.dm.rej
 2017-05-08 00:25:20 -07:00
kevinz000
49881624e2 Merge pull request #772 from Citadel-Station-13/upstream-merge-26874 
[MIRROR] Fixes the most annoying thing about admin helping.
 2017-05-07 23:16:33 -07:00
kevinz000
010baa6a34 Merge pull request #661 from Citadel-Station-13/upstream-merge-26705 
[MIRROR] Fixes spelling for Lavaland Syndicate
 2017-05-07 22:53:29 -07:00
kevinz000
a87424e105 Merge pull request #735 from Citadel-Station-13/upstream-merge-26813 
[MIRROR] Curator Update
 2017-05-07 22:53:24 -07:00
kevinz000
9ca8b570b2 Merge branch 'master' into upstream-merge-26705 2017-05-07 22:53:14 -07:00
kevinz000
52a8aacd00 Delete lavaland_ruin_code.dm.rej 2017-05-07 22:52:47 -07:00
kevinz000
204a3a3938 Update lavaland_ruin_code.dm 2017-05-07 22:52:39 -07:00
kevinz000
bd8bfe1327 Merge pull request #684 from Citadel-Station-13/upstream-merge-26728 
[MIRROR] A bunch of sparks to do_sparks [Travis error unrelated to PR]
 2017-05-07 22:41:24 -07:00
kevinz000
8c80fee6aa Merge pull request #835 from Citadel-Station-13/upstream-merge-26993 
[MIRROR] Allows Mediborg organ storage to hold inorganic bodyparts
 2017-05-07 22:36:52 -07:00
kevinz000
2e0dd27978 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813 2017-05-07 22:28:00 -07:00
kevinz000
e3f123d5bb Merge pull request #821 from Citadel-Station-13/upstream-merge-26970 
[MIRROR] Fixes an inconsistency with the Banana Honk drink
 2017-05-07 19:19:44 -07:00
kevinz000
68e1087825 Merge pull request #823 from Citadel-Station-13/upstream-merge-26959 
[MIRROR] Mega arachnid
 2017-05-07 19:17:10 -07:00
kevinz000
6c293e3e3d Merge pull request #716 from Citadel-Station-13/upstream-merge-26768 
[MIRROR] Species-locked inventory slots are now indicated.
 2017-05-07 19:15:02 -07:00
kevinz000
eb9caea261 Merge pull request #658 from Citadel-Station-13/upstream-merge-26670 
[MIRROR] The least surprising nerf: Null Crates & Emagged Plasma Export Bonus
 2017-05-07 19:14:06 -07:00
kevinz000
2f55a67b7a Delete packs.dm.rej 2017-05-07 19:13:39 -07:00
kevinz000
18abfb70c9 Update packs.dm 2017-05-07 19:13:29 -07:00
kevinz000
2a8acb13d2 Merge pull request #840 from Citadel-Station-13/upstream-merge-26966 
[MIRROR] Fixes being able to stand on chasms
 2017-05-07 19:07:59 -07:00
kevinz000
09dbd467bb Merge pull request #820 from Citadel-Station-13/upstream-merge-26976 
[MIRROR] Fixes away gateway
 2017-05-07 19:07:41 -07:00
kevinz000
cab4c53f06 Merge pull request #841 from Citadel-Station-13/upstream-merge-26940 
[MIRROR] Plastic sheet production - Chemistry recipe
 2017-05-07 19:06:30 -07:00
LetterJay
2efe90055f Revert "[MIRROR] Fixes say verbs not working" 2017-05-07 19:41:33 -04:00
CitadelStationBot
61a7897962 Plastic sheet production - Chemistry recipe 2017-05-07 18:23:05 -05:00
CitadelStationBot
884338d048 Fixes being able to stand on chasms 2017-05-07 18:06:44 -05:00
CitadelStationBot
6d2b02dabd Allows Mediborg organ storage to hold inorganic bodyparts 2017-05-07 17:14:17 -05:00
LetterJay
75ca44a767 Merge pull request #827 from LetterJay/snap 
Snap Emote
 2017-05-07 15:41:32 -05:00
LetterJay
659139ca1c finger snap emote 2017-05-07 12:41:45 -05:00
CitadelStationBot
617bb4ed38 Mega arachnid 2017-05-07 08:55:11 -05:00
CitadelStationBot
27e7434320 Fixes an inconsistency with the Banana Honk drink 2017-05-07 08:54:02 -05:00
CitadelStationBot
164b830f23 Fixes away gateway 2017-05-07 08:52:57 -05:00
kevinz000
14fe4948e9 Merge pull request #652 from Citadel-Station-13/upstream-merge-26685 
[MIRROR] Fixed Dsay always causing a disk read
 2017-05-06 22:03:08 -07:00
kevinz000
52f5226547 Merge pull request #750 from Citadel-Station-13/upstream-merge-26851 
[MIRROR] Fixes runtime with null nutriment taste data
 2017-05-06 22:00:16 -07:00
kevinz000
236c91a945 Merge pull request #755 from Citadel-Station-13/upstream-merge-26809 
[MIRROR] Increases pixel projectile angles/accuracy
 2017-05-06 21:59:40 -07:00
kevinz000
035dd93158 Merge pull request #756 from Citadel-Station-13/upstream-merge-26848 
[MIRROR] Adds spewium toxin in traitor kits
 2017-05-06 21:43:08 -07:00
kevinz000
1c7fa59d6c Merge pull request #798 from Citadel-Station-13/upstream-merge-26910 
This makes Nar'Sie a girl ------------> [MIRROR] hm
 2017-05-06 21:42:22 -07:00
kevinz000
5ac3bb924f Merge pull request #799 from Citadel-Station-13/upstream-merge-26939 
[MIRROR] Blorble
 2017-05-06 21:41:56 -07:00
kevinz000
51442e4930 Merge pull request #802 from Citadel-Station-13/upstream-merge-26930 
[MIRROR] Preliminary tesla projectile refactor (also insults vcordie because I'm mean.)
 2017-05-06 21:34:07 -07:00
kevinz000
286e492df8 Merge pull request #757 from Citadel-Station-13/upstream-merge-26846 
[MIRROR] Fixes detective scanner not being able to ranged scan, adds range/viewcheck vars
 2017-05-06 21:31:47 -07:00
kevinz000
102b28b1c1 Delete deadsay.dm.rej 2017-05-06 21:28:23 -07:00
kevinz000
32d81b8624 Merge pull request #736 from Citadel-Station-13/upstream-merge-26803 
[MIRROR] Gives ears, eyes, and vocal cords plural gender
 2017-05-06 21:24:15 -07:00
kevinz000
b7621ff9fe Merge pull request #813 from Citadel-Station-13/upstream-merge-26937 
[MIRROR] Elevators
 2017-05-06 20:57:55 -07:00
kevinz000
db50cc8c94 Merge pull request #812 from Citadel-Station-13/upstream-merge-26949 
[MIRROR] ORM fixes
 2017-05-06 20:57:17 -07:00
kevinz000
bfe7441f9b Merge pull request #791 from Citadel-Station-13/upstream-merge-26867 
[MIRROR] Holy water will now properly make you jittery
 2017-05-06 15:41:24 -07:00
kevinz000
4a2a0e8a0d Merge pull request #732 from Citadel-Station-13/upstream-merge-26778 
[MIRROR] Plasma vessels regenerate slowly off resin
 2017-05-06 15:26:10 -07:00
CitadelStationBot
df204497cd Elevators 2017-05-06 16:29:50 -05:00
kevinz000
d43e64bcc3 Merge pull request #774 from Citadel-Station-13/upstream-merge-26805 
[MIRROR] Fixes SM Tesla admin log spam, adds containment field count to investigate logs.
 2017-05-06 14:24:08 -07:00
kevinz000
e5249ff8d0 Merge pull request #764 from Citadel-Station-13/upstream-merge-26855 
[MIRROR] Makes dental implants move through dismemberment
 2017-05-06 14:23:03 -07:00
kevinz000
329190d660 Merge pull request #809 from Citadel-Station-13/upstream-merge-26933 
[MIRROR] Makes medbay vending machines buildable
 2017-05-06 14:22:08 -07:00
CitadelStationBot
d7bdb49283 ORM fixes 2017-05-06 16:20:39 -05:00
kevinz000
b6231af063 Merge pull request #682 from Citadel-Station-13/upstream-merge-26731 
[MIRROR] Buffs mercury and lithium [Travis error unrelated to PR]
 2017-05-06 14:08:51 -07:00
kevinz000
cc8d113c0f Merge branch 'master' into upstream-merge-26928 2017-05-06 14:05:16 -07:00