shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,685 Commits 5 Branches 0 Tags
8d9dc6dd136647149db6f0bc274a4e0729a2b0cd
Commit Graph

106 Commits

Author SHA1 Message Date
CitadelStationBot
3ee26917bd Organ Update [Cloning isn't broken edition] 2017-07-14 09:00:36 -05:00
CitadelStationBot
55462ed7d1 Replaces ex_act and emp_act numbers with defines 2017-07-13 17:46:41 -05:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot
1b70c06474 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs (#1970) 2017-07-10 16:10:42 -07:00
LetterJay
ff0c889a29 Merge pull request #1961 from Citadel-Station-13/upstream-merge-29140 
[MIRROR] Removes now-unnecessary obj_integrity definitions
 2017-07-09 23:06:13 -05:00
CitadelStationBot
90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
CitadelStationBot
08eaad468a Makes medipens unable to be emptied and then filled with toxins for a hardsuit-piercing OHKO weapon that has the disguise of medical aid 2017-07-09 06:43:42 -05:00
CitadelStationBot
beccb4742f Replaces all instances of spawn() with addtimer/INVOKE_ASYNC 2017-07-06 09:14:03 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
9d5e51777b use_power var now uses a define to reflect it not being a bool (#1842) 2017-06-30 20:41:59 -07:00
CitadelStationBot
fbb0378072 Updates blender descriptions (#1660) 2017-06-28 22:14:40 -07:00
CitadelStationBot
bae20af5ff makes virology window larger 2017-06-28 08:28:44 -05:00
LetterJay
e680da7de6 Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584 
[MIRROR] Ancient Space Station [Space Spawn Ruin]
 2017-06-27 21:25:50 -05:00
CitadelStationBot
6a38955803 Adds container types INJECTABLE and DRAWABLE 2017-06-27 08:19:49 -05:00
CitadelStationBot
d4c54bb0b5 Ancient Space Station [Space Spawn Ruin] 2017-06-25 11:03:27 -05:00
LetterJay
42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
LetterJay
a1bd66ef8b Merge pull request #1634 from Citadel-Station-13/upstream-merge-28414 
[MIRROR] Adds onions
 2017-06-17 10:04:59 -05:00
CitadelStationBot
f86bda7cda Adds onions 2017-06-16 16:22:38 -05:00
CitadelStationBot
9bd98194b2 Vomit fix 2017-06-16 15:19:26 -05:00
CitadelStationBot
ef8f730ef0 Welder sprites properly update upon refilling at a fueltank. 2017-06-15 20:49:45 -05:00
LetterJay
4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync 
Selective mirror sync
 2017-06-14 06:41:01 -05:00
CitadelStationBot
183ce05921 Lowers Uranium virology reagents down to 1 from 5 (#1451) 2017-06-13 13:44:58 -07:00
LetterJay
55e565ab8c upstream-merge-27973 2017-06-11 02:16:35 -05:00
LetterJay
f694264371 compile fix 2017-06-11 02:14:54 -05:00
LetterJay
c760c52817 upstream-merge-27951 2017-06-11 02:11:34 -05:00
LetterJay
a8b71089ae upstream-merge-27933 2017-06-11 02:03:27 -05:00
LetterJay
4624ec7e04 upstream-merge-27899 2017-06-11 00:09:55 -05:00
CitadelStationBot
b1b39093e9 Changes Amanitin log message 2017-06-09 20:27:10 -05:00
CitadelStationBot
d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
CitadelStationBot
32c288dfc8 Gives the pod people's dispenser all the chemicals they could ever want. (#1357) 2017-06-03 06:36:34 -07:00
CitadelStationBot
9873fe0957 Buffs nitrous oxide (#1339) 2017-06-02 21:22:08 -07:00
CitadelStationBot
11344c4682 Refactors explosions 2017-05-24 16:45:00 -05:00
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