shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,664 Commits 5 Branches 0 Tags
a7ec44bfccd29bbd9a96fd0d2fe8dbfadf42e72f
Commit Graph

319 Commits

Author SHA1 Message Date
oranges
d8f232bd07 Merge pull request #34204 from ShizCalev/chem-macro-feedback 
improves chem macro feedback
 2018-01-11 14:02:35 -06:00
deathride58
7280d91628 Minor boxstation changes, merges #4694 and #4697 2018-01-08 00:55:05 -05:00
deathride58
85aa297923 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:30:41 +00:00
ShizCalev
7956e3df27 Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp 2018-01-07 11:02:49 -06:00
deathride58
aabbbb9dff aaaand the rest of the modules folder 2018-01-04 01:45:38 -05:00
vuonojenmustaturska
edea89c8fe You can taste oil (#34046) 2018-01-03 15:06:54 -06:00
LetterJay
168519c328 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311 2018-01-01 07:00:34 -06:00
LetterJay
c8f3fdfe38 Merge branch 'master' into upstream-merge-33663 2017-12-30 13:29:36 -06:00
LetterJay
b260704381 Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705 
[MIRROR] Turns the baseturf var into a part time list
 2017-12-30 13:19:00 -06:00
LetterJay
a3ebaa5de8 Merge branch 'master' into upstream-merge-32311 2017-12-29 18:38:50 -06:00
LetterJay
a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
XDTM
d8943d6a1e [Ready]Adds the Pax reagent, small tweaks to pacifism 2017-12-29 02:37:58 -06:00
LetterJay
518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 
# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm
 2017-12-29 01:34:17 -06:00
Robustin
4157c30fd8 Fixes ethanol + book reaction message (#33867) 2017-12-29 00:28:40 -06:00
LetterJay
8a792d6ef6 more save points 2017-12-29 00:07:36 -06:00
oranges
0223fed7a3 Merge pull request #33868 from Robustin/EMPruntime 
Fixes EMP runtime
 2017-12-28 04:09:06 -06:00
oranges
269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
LetterJay
5dd7136225 Merge branch 'master' into upstream-merge-33590 2017-12-25 21:29:18 -06:00
Emmett Gaines
9d0a4722e5 turns the baseturf var into a part time list (#33705) 2017-12-25 19:11:06 -06:00
LetterJay
ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
Jordan Brown
164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -06:00
CitadelStationBot
6856fc1be2 [MIRROR] [s] Fixes the frying oil reagent (#4504) 
* Merge pull request #33745 from vuonojenmustaturska/oilfix

[s] Fixes the frying oil reagent

* [s] Fixes the frying oil reagent
 2017-12-22 12:32:56 -08:00
kevinz000
bec20087c2 [READY]Clownborgs - ADMIN SPAWN ONLY 2017-12-22 10:58:13 -06:00
LetterJay
b749977eb9 Merge pull request #4476 from Citadel-Station-13/upstream-merge-33697 
[MIRROR] Fix smoke machine runtime
 2017-12-21 04:57:02 -06:00
LetterJay
3973b368de Merge branch 'master' into upstream-merge-33470 2017-12-21 03:24:03 -06:00
MoreRobustThanYou
39ecfd64db Fix smoke machine runtime (#33697) 
* Fix smoke machine runtime

* Woops.
 2017-12-21 00:41:09 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
LetterJay
349b0f4f20 Update spray.dm 2017-12-19 17:19:05 -06:00
LetterJay
fdfdaa230a Update glass.dm 2017-12-19 17:18:27 -06:00
LetterJay
39b016306c Update reagent_containers.dm 2017-12-19 17:17:54 -06:00
LetterJay
9e452adcc8 Update holder.dm 2017-12-19 17:16:45 -06:00
LetterJay
1b9d60c604 Update reagent_containers.dm 2017-12-19 15:29:55 -06:00
ACCount
522b8383d8 [READY]Refactors reagent container types 2017-12-18 22:54:51 -06:00
XDTM
3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
nicbn
da25df9329 Makes the chemical smoke machine use stock parts for things 2017-12-18 15:15:33 -06:00
LetterJay
3c5632bad2 Update pill.dm 2017-12-17 17:38:51 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
Ashe Higgs
2aef00daf0 All-In-One grinder results are now defined by type, not by huge lists 2017-12-14 15:48:39 -06:00
Leo
27c06118cb Merge pull request #33478 from ACCount12/another_explosion_fix 
Fixes yet another chem explosion throwing warnings
 2017-12-13 14:13:36 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
coiax
6846e87ae2 Silver slime extract foods now fry correctly (#33309) 
* Silver slime extract foods now fry correctly

The invocation to create fried food wasn't correct, and was ending up
creating fried food that had the default name and description.

- Also adds a "syringe/plasma" type, because it's annoying having to
spawn in plasma sheets and grind them and then put them into a syringe,
if you want to test slime spawning stuff.

* Contains
 2017-12-10 17:42:20 -06:00
deathride58
7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
ACCount
fd6a386779 Improves the way chem machines handle qdel, fixes some runtimes (#33415) 2017-12-10 13:25:21 -06:00
deathride58
e18457f92e Merge pull request #4284 from Citadel-Station-13/upstream-merge-33356 
[MIRROR] Fixes meth explosions throwing warnings
 2017-12-10 03:12:19 +00:00
ACCount
3c9758fe80 Fixes meth explosion throwing warnings (#33356) 2017-12-09 01:09:04 -06:00
deathride58
742d50b5e7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization 
# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi
 2017-12-08 19:58:41 -05:00
oranges
10d50dd283 Fixes mugs being called "broken bottles" 2017-12-08 10:34:27 -06:00
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00