shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,225 Commits 5 Branches 0 Tags
27d466bda4e9bec2bb8a2b3baecedcf653afe32f
Commit Graph

101 Commits

Author SHA1 Message Date
CitadelStationBot
7e539bfe3b Fixes Explosive Lattice blobs being way more fragile than they should be 2017-08-06 18:02:40 -05:00
CitadelStationBot
55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
kevinz000
bbcad2fa58 Proper mirror PR for the disease refactor because I fucked up the first one. (#2026) 
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
 2017-07-31 23:41:22 -07:00
ktccd
aa5ce7ebb1 Merge pull request #2166 from Citadel-Station-13/upstream-merge-29540 
[MIRROR] Fixes mutation toxins not stunning properly
 2017-07-31 21:46:03 +02:00
LetterJay
35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304 
[MIRROR] Made some object lists less terrible to read
 2017-07-31 03:43:03 -05:00
CitadelStationBot
5da5e58ee5 Fixes a lot of eye damage procs 2017-07-30 08:16:38 -05:00
CitadelStationBot
e3334ad1a8 Fixes mutation toxins not stunning properly 2017-07-28 09:02:02 -05:00
CitadelStationBot
7ce6be92a0 Virology fixes (#2097) 2017-07-24 04:08:07 -07:00
CitadelStationBot
5dc1120b2f Calling the base on_mob_life is mandatory (#2083) 2017-07-20 06:31:10 -07:00
LetterJay
85f1b25bcd Merge pull request #1986 from Citadel-Station-13/upstream-merge-28556 
[MIRROR] [Seriously, it's ready]Virology Rework: The Thresholdening
 2017-07-19 06:29:06 -05:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
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
194a6b7aa9 [Seriously, it's ready]Virology Rework: The Thresholdening 2017-07-13 17:46:25 -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
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
CitadelStationBot
6a38955803 Adds container types INJECTABLE and DRAWABLE 2017-06-27 08:19:49 -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
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
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
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
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