shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,898 Commits 5 Branches 0 Tags
e292b050f8a413c3f643b20664f2ea3dcf6f4e21
Commit Graph

358 Commits

Author SHA1 Message Date
deathride58
86fa4871a6 Merge pull request #5114 from Citadel-Station-13/upstream-merge-34910 
[MIRROR] Fixes Ketrazine recipe
 2018-01-26 15:54:25 +00:00
deathride58
a539f6103a Merge pull request #5107 from Citadel-Station-13/upstream-merge-34881 
[MIRROR] Adds Pax to the Peacekeeper Borg's "Peace Hypospray"
 2018-01-26 15:50:38 +00:00
Jordan Brown
5db9ca3085 Merge pull request #34910 from GuppyLaxx/idk 
Fixes Ketrazine recipe
 2018-01-26 03:00:52 -06:00
Jordan Brown
f2d75f1439 Merge pull request #34881 from Robustin/paxPK 
Adds Pax to the Peacekeeper Borg's "Peace Hypospray"
 2018-01-26 02:59:45 -06:00
ShizCalev
e4a96fe2cd Syringe update_icon sanity 2018-01-26 02:59:21 -06:00
LetterJay
76fab4fccf Revert "[MIRROR] Fix old usages of trait introduced by the trait merge" 2018-01-24 23:14:51 -06:00
LetterJay
7a8fbb08c6 Merge branch 'master' into upstream-merge-34894 2018-01-24 21:17:35 -06:00
LetterJay
8ea6f372ed Update medicine_reagents.dm 2018-01-24 20:50:21 -06:00
LetterJay
793b4be13f Merge pull request #5066 from Citadel-Station-13/upstream-merge-34773 
[MIRROR] Shifts vars off /mob to the correct subtype
 2018-01-24 20:46:46 -06:00
LetterJay
7ec4e826c3 Merge pull request #5067 from Citadel-Station-13/upstream-merge-34690 
[MIRROR] New Cocktail: The Nar'Sour
 2018-01-24 20:46:27 -06:00
Jordan Brown
2e6ce795ed Fix old usages of trait introduced by the trait merge 2018-01-24 15:18:41 -06:00
Ordonis
00d1e8f902 Adds Ketrazine, a powerful combat stimulant with severe side-effects which can be synthesized by the crew (#34579) 
🆑 Ordo
rscadd: Adds Ketrazine, a powerful but dangerous combat stim which the crew can synthesize
/🆑
 2018-01-24 14:08:38 -06:00
LetterJay
646aa3f2f8 Update alcohol_reagents.dm 2018-01-24 13:58:47 -06:00
LetterJay
85a7788dd3 Merge branch 'master' into upstream-merge-34773 2018-01-24 13:58:12 -06:00
Robustin
fb5195aa4e New Cocktail: The Nar'Sour 2018-01-24 12:56:21 -06:00
ShizCalev
cae2e5e1eb Shifts vars off /mob to the correct subtype 2018-01-24 12:00:05 -06:00
Dax Dupont
e47e31ff1d Puts beakers in your hand on eject (#34787) 2018-01-24 06:12:09 -06:00
MrDoomBringer
4d206f56e8 Adds ~70 more suicides 2018-01-23 01:39:07 -06:00
ShizCalev
fb86cf6878 Fixes syringe icons (#34704) 2018-01-22 12:01:02 -06:00
LetterJay
a415630f0e Merge pull request #4985 from Citadel-Station-13/upstream-merge-34515 
[MIRROR] Gas Reagents dump out based on container temperature
 2018-01-21 11:55:23 -06:00
LetterJay
a29c1bee0b Merge pull request #4984 from Citadel-Station-13/upstream-merge-34485 
[MIRROR] Couple of chemistry fixes
 2018-01-21 11:54:16 -06:00
LetterJay
7a43017325 Merge pull request #4974 from Citadel-Station-13/upstream-merge-34656 
[MIRROR] Fixes missing MakeSlippery() args
 2018-01-21 11:48:56 -06:00
LetterJay
23742c18c5 Merge pull request #4929 from Citadel-Station-13/upstream-merge-34133 
[MIRROR] Temperature Refactor and Fixes
 2018-01-21 11:47:08 -06:00
BordListian
2abbd8cc89 - Changes gas reagents (liquid plasma, oxygen, etc) to emit gas based on chem temperature instead of at room temperature when dumped. (#34515) 2018-01-21 02:04:40 -06:00
BordListian
8d5d7d1d50 - Fixes smoke and foam having 1/4th of the reagents they should have (yoooo) 
- Fixes copy_to runtiming if you transfer from a container that contains nothing directly to a reagents datum
- Removes redundant total_volume check in trans_to
- Fixes cryostylane and pyrosium not heating up people
- Fixes cryostylane cooling beakers to negative kelvins
- Fixes cryostylane cooling people to negative kelvins (stop copypasting code for temperature)
 2018-01-21 02:01:26 -06:00
Jordan Brown
bb51095b00 Merge pull request #34656 from ShizCalev/makeslippery 
Fixes missing MakeSlippery() args
 2018-01-20 14:09:49 -06:00
AnturK
3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
Robustin
7a16f0a3ef Temperature Refactor and Fixes 2018-01-19 08:41:34 -06:00
LetterJay
6981bcfab2 Merge pull request #4909 from Citadel-Station-13/upstream-merge-34541 
[MIRROR] Adds a Recipe for morphine to medicine
 2018-01-19 02:49:12 -06:00
Jordan Brown
594e8c8e6d Merge pull request #34553 from ShizCalev/abstract-transfertoloc 
Fixes being able to place abstract items in fridges & chem dispensers
 2018-01-18 16:48:32 -06:00
Ordonis
c2f8339135 Adds a Recipe for morphine to medicine (#34541) 
* Adds a Recipe for morphine to medicine

Exactly what it says on the tin.

* Ketrazine

Adds ketrazine, a combat stimulant with severe consequences for use.

* Revert "Ketrazine"

This reverts commit d618fe337cc28f5513c59ff3399894c10dde4a7d.
 2018-01-18 15:07:13 -06:00
Jordan Brown
292fb13612 Merge pull request #34463 from DaedalusGame/micro_fix 
Fixes duplicate reagents in chemistry macros
 2018-01-16 07:40:47 -06:00
Leo
4b56baf1a6 Merge pull request #34372 from YPOQ/slimestopfix 
Fixes players not being immune to their own slime timestops
 2018-01-14 21:35:50 -06:00
ShizCalev
80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
deathride58
257ee69202 Merge pull request #4811 from Citadel-Station-13/upstream-merge-34360 
[MIRROR] Fixes clownborg sprays not recharging
 2018-01-13 20:29:01 +00:00
deathride58
0cad3946c3 Merge pull request #4799 from Citadel-Station-13/upstream-merge-34161 
[MIRROR] Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
 2018-01-13 20:24:13 +00:00
Leo
e8d21ac1f3 Merge pull request #34360 from kevinz000/patch-429 
Fixes clownborg sprays not recharging
 2018-01-13 13:25:24 -06:00
oranges
8c1c9f5cd7 Merge pull request #34161 from ShizCalev/bot_sssembly 
Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
 2018-01-13 04:23:03 -06:00
kevinz000
54b356a227 Fixes stimulum running out before the next breath (#34296) 2018-01-12 13:05:12 -06:00
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