shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,356 Commits 5 Branches 0 Tags
750baf3dcafe2e9c5bd2fb22b24e886ad934a1bd
Commit Graph

74 Commits

Author SHA1 Message Date
LetterJay
da1eb3d96f Merge pull request #1147 from Citadel-Station-13/upstream-merge-27546 
[MIRROR] Water wets hide, you can microwave wet leather
 2017-05-24 07:54:34 -05:00
CitadelStationBot
3a97af10cf Water wets hide, you can microwave wet leather 2017-05-24 00:18:51 -05:00
CitadelStationBot
e29928312d Reworks spray tan overdoses so they actually make sense 2017-05-24 00:16:45 -05:00
LetterJay
0b1a680d1a Merge pull request #1087 from Citadel-Station-13/upstream-merge-27480 
[MIRROR] Ports pandemic to tgui
 2017-05-23 06:13:41 -05:00
CitadelStationBot
240d195e2c Fixes a probable bug/exploit that allows for fully ignoring slows 2017-05-22 22:46:59 -05:00
LetterJay
d1db0044d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344 2017-05-22 11:52:18 -05:00
CitadelStationBot
7df5632d6e Minor Grammar Fixes 2017-05-21 22:28:29 -05:00
CitadelStationBot
d7f0b9494b Ports pandemic to tgui 2017-05-21 22:28:16 -05:00
CitadelStationBot
a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBot
acbaa45aee Adds a few new recipes created with plastic sheets (#979) 2017-05-18 11:53:17 -05:00
CitadelStationBot
257cf986c5 Repaths C4 (#808) 
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
 2017-05-18 00:37:20 -05:00
CitadelStationBot
cd122501fc Refactors blood regeneration from nutriment (#839) 
* Refactors blood regeneration from nutriment

* Update blood.dm

* Delete blood.dm.rej

* Update blood.dm
 2017-05-18 00:03:51 -05:00
CitadelStationBot
226fdf9040 Remaps seed vault, adds bees and changes cherry to cherry bomb in random seed spawn (#973) 2017-05-14 20:12:00 -07:00
LetterJay
6718ea096d Merge pull request #937 from Citadel-Station-13/upstream-merge-27148 
[MIRROR] Buffs honey
 2017-05-14 16:30:51 -04:00
CitadelStationBot
4a67fe55a4 Buffs nitrous oxide 2017-05-14 07:39:05 -05:00
LetterJay
52fa1f314f Merge branch 'master' into upstream-merge-26760 2017-05-14 01:02:26 -04:00
CitadelStationBot
b9ad2c31c9 Buffs honey 2017-05-13 18:00:53 -05:00
LetterJay
485bca003f Merge pull request #640 from Citadel-Station-13/upstream-merge-26527 
[MIRROR] Zombie/limb refactors/fixes
 2017-05-13 01:24:55 -04:00
CitadelStationBot
4a818bee1f Adds Sticks of Butter, Mayonnaise, and Mix function to grinder (#896) 2017-05-10 16:16:48 -07:00
CitadelStationBot
faf8829d30 [MIRROR] Adamantine golem leadership (#785) 
* Adamantine golem leadership

* Update stylesheet.dm

* Delete golems.dm.rej

* Delete stylesheet.dm.rej

* Update golems.dm

* fuck line endings
 2017-05-08 22:16:09 -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
CitadelStationBot
61a7897962 Plastic sheet production - Chemistry recipe 2017-05-07 18:23:05 -05:00
CitadelStationBot
27e7434320 Fixes an inconsistency with the Banana Honk drink 2017-05-07 08:54:02 -05: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
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
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
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
CitadelStationBot
10846d5d37 Replaces stun/weaken from Miner's salve 2017-05-06 10:48:07 -05:00
CitadelStationBot
b993d9ad23 Holy water will now properly make you jittery 2017-05-05 18:33:34 -05:00
CitadelStationBot
46d7976488 Adds spewium toxin in traitor kits 2017-05-04 17:53:42 -05:00
CitadelStationBot
36b517d2ba Fixes runtime with null nutriment taste data 2017-05-04 13:32:01 -05:00
CitadelStationBot
8a221b9637 Ports pastries to Initialize 2017-05-03 05:55:15 -05:00
LetterJay
91cb42cf60 Merge pull request #699 from Citadel-Station-13/upstream-merge-26556 
[MIRROR] Saline-glucose changes
 2017-05-02 18:44:53 -05:00
LetterJay
6310292531 woo 2017-05-02 11:19:14 -05:00
LetterJay
3b8484b52b Merge pull request #579 from Citadel-Station-13/upstream-merge-26129 
[MIRROR] Unorphans the blackbox
 2017-05-02 05:13:49 -05:00
CitadelStationBot
036109de58 Changes a bunch of hrefs to the proper defines 2017-05-02 02:20:07 -05:00
LetterJay
b57a4aa6b4 Merge branch 'master' into upstream-merge-26386 2017-05-01 15:27:25 -05:00
CitadelStationBot
3e80105ffb Saline-glucose changes 2017-05-01 12:55:45 -05:00
CitadelStationBot
ace93b6cfd Buffs mercury and lithium 2017-05-01 08:34:51 -05:00
CitadelStationBot
87e306851d Readds deepstorage w/ tweaks AND adds water bottles to vending machines 2017-05-01 07:24:41 -05:00
LetterJay
06bfa8770e Merge branch 'master' into upstream-merge-26129 2017-04-29 11:45:37 -05:00
LetterJay
991fb8335c manual merge 2017-04-29 11:42:28 -05:00
CitadelStationBot
daeba2eec7 Zombie/limb refactors/fixes 2017-04-28 21:05:06 -05:00
LetterJay
22440109e2 Merge pull request #598 from Citadel-Station-13/upstream-merge-26605 
[MIRROR] Adds crayon grinding
 2017-04-27 12:48:27 -05:00
CitadelStationBot
870ee9ca6c Minor IV/bloodbag grammar fixes 2017-04-27 09:21:57 -05:00
CitadelStationBot
83916bee5d Adds crayon grinding 2017-04-27 09:17:44 -05:00
CitadelStationBot
bcab389ca2 New() goes in the trash, we've gotta Initialize() 2017-04-26 17:15:48 -05:00
CitadelStationBot
bde5d6253a Unorphans the blackbox 2017-04-26 17:05:23 -05:00
CitadelStationBot
87ce25df9b Removes a unused chem (#576) 2017-04-26 11:09:00 -05:00
CitadelStationBot
84321916a5 Refactors ears into organs (#513) 
* Refactors ear damage into ear organs

* Update human.dm

* Update species.dm

* Delete species.dm.rej

* Update tgstation.dme

* Delete tgstation.dme.rej

* Delete human.dm.rej

* Update tongue.dm

* Delete surgery.dmi

* upload fixed surgery.dmi
 2017-04-26 09:52:35 -05:00