shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,474 Commits 5 Branches 0 Tags
0ca84b7cc52ff2dc51d4f4aa4a239108ea2d2fbf
Commit Graph

19936 Commits

Author SHA1 Message Date
evan
0ca84b7cc5 Update species.dm 
woops, forgot something
 2021-12-07 22:11:56 -05:00
evan
5a7dbfe9ef Update pool_controller.dm 2021-12-07 21:50:16 -05:00
evan
afe6179191 Update species.dm 2021-12-07 21:39:17 -05:00
evan
2099f18506 Update pool_controller.dm 2021-12-07 21:28:30 -05:00
DeltaFire
e576962ac3 e 2021-12-03 18:29:13 +01:00
Lin
e506bc50dc Merge pull request #15335 from DeltaFire15/synth-chem-time 
Synth / IPC kinda-buffs - Chemwarfare Edition
 2021-12-01 00:39:02 +00:00
Lin
5dc9704e5d Merge pull request #15380 from DeltaFire15/oops-all-wounds 
Block & Pellet wound pass
 2021-11-30 20:24:42 +00:00
Lin
336a66edd5 Merge pull request #15386 from keronshb/winterball2021 
FestiveMap (Winter Ball 2021)
 2021-11-27 23:44:51 +00:00
Linzolle
afe81f711b Merge branch 'winterball2021' of github.com:keronshb/Citadel-Station-13 into winterball 2021-11-26 18:46:57 -07:00
Lin
43aa80f9e7 Merge pull request #15397 from SandPoot/lewdcap- 
Allows toggling of Captain's female formal outfit's legs
 2021-11-26 17:47:50 -07:00
SandPoot
3618248b4e Upload files 2021-11-24 23:11:12 -03:00
Lin
d5c17f0d84 Merge pull request #15376 from SandPoot/double 
Double beds
 2021-11-24 17:38:10 +00:00
Lin
e3a5391250 Merge pull request #14868 from Arturlang/admin_mapsave 
buildmode mapgen tool save [ready]
 2021-11-24 17:32:48 +00:00
Lin
f33af9b35c Merge pull request #15392 from timothyteakettle/fix-oil-drum 
oil drum now recognises synthetic anthormorphs as synths
 2021-11-23 21:55:07 +00:00
silicons
38f7e07bcc Update living.dm (#15394) 2021-11-23 18:36:51 +01:00
Timothy Teakettle
d9276418ae Update anthropomorph.dm 2021-11-22 00:15:42 +00:00
keronshb
146ada0d3d Removes anchored from jacq 2021-11-20 23:54:16 -05:00
keronshb
af83fb9611 FestiveMap 2021 2021-11-20 12:04:35 -05:00
Lin
5b0fe8d392 Merge pull request #15381 from DeltaFire15/battery-supply 
Synthetics can now hook up their power cord to cells instead of relying on moth-esque code
 2021-11-20 07:04:15 +00:00
Lin
22d297abe8 Merge pull request #15382 from keronshb/clockworkupdates 
Allows Clockwork cultists to create Cogscarabs.
 2021-11-20 07:03:32 +00:00
Artur
99dedb54ed Merge remote-tracking branch 'upstream/master' into admin_mapsave 2021-11-20 00:16:56 +02:00
Putnam3145
1e01852b93 Merge pull request #15320 from shellspeed1/working-on-new-fancy-syringe-guns 
Improvements to the reagent gun and brand new smart dart repeater. [Ready]
 2021-11-17 17:09:23 -08:00
Lin
b10e9def21 Merge pull request #15360 from SandPoot/tgui_emergency 
Emergency tgui fixing measures
 2021-11-17 16:35:16 +00:00
Lin
efa02148d1 Merge pull request #15275 from keronshb/halloweenball2021 
Spookystation (Ball Map) and Vector Cars
 2021-11-17 16:26:07 +00:00
Lin
4e407ffeb6 Merge pull request #15371 from DeltaFire15/unintended-devastation 
Devastation level explosions no longer delete organs of gibbed humans
 2021-11-17 16:19:23 +00:00
Lin
ce1a400617 Merge pull request #15373 from DeltaFire15/reebe-testing 
Reebe now has a proc to load it
 2021-11-17 16:15:06 +00:00
keronshb
7b195c3973 Cogscarabs 
The return
 2021-11-16 22:41:08 -05:00
DeltaFire
855df65ba2 cord cell charge 2021-11-16 22:56:31 +01:00
DeltaFire
ef9c90d512 embeds, unarmed and wounds 2021-11-16 20:26:38 +01:00
Putnam3145
2cdc3a9d30 makes regal rat require not being dead to use abilities 2021-11-15 21:02:52 -08:00
DeltaFire
cf767252f6 effect multipler 2021-11-16 02:57:00 +01:00
DeltaFire
cf777da85f success if already loaded 2021-11-15 17:54:32 +01:00
SandPoot
5b85c260a7 Upload files 2021-11-15 01:34:30 -03:00
DeltaFire
9ae59be10e lies 2021-11-14 22:47:35 +01:00
DeltaFire
3f9ad6a954 should do this instead 2021-11-14 22:44:43 +01:00
DeltaFire
314a3a049f lets just return true instead 2021-11-14 22:38:48 +01:00
DeltaFire
50c7d4914f reebe loading (woo) 2021-11-14 22:25:39 +01:00
DeltaFire
6224da71a3 contents_explosion 
at least this one had less overrides.
 2021-11-14 21:41:42 +01:00
DeltaFire
6aa906395c not a gaius reference 
hhhh let me just replace all the ex_acts missing some args and adjust them
 2021-11-14 21:34:59 +01:00
DeltaFire
7d2ff194d1 this WILL fail CI 
hnnnngh
 2021-11-14 20:48:41 +01:00
Lin
9f443c9285 Merge pull request #15362 from Putnam3145/teg-fix 
Makes TEG generate heat based on actual heat transfer (again)
 2021-11-13 04:42:53 +00:00
shellspeed1
8ab281dfd6 make hot swap work properly 2021-11-12 19:21:45 -08:00
shellspeed1
e3407c5b39 unfucks a few things post comments. 2021-11-12 19:00:17 -08:00
DeltaFire
8ca1015510 reagent_all_process macro 2021-11-13 03:23:11 +01:00
shellspeed1
030f078445 Update code/modules/projectiles/guns/misc/chem_gun.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:22:32 -08:00
shellspeed1
f67cf99757 Update code/modules/projectiles/guns/misc/chem_gun.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:22:19 -08:00
shellspeed1
329336f5ed Update code/modules/projectiles/ammunition/special/syringe.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:19:06 -08:00
shellspeed1
6363d9a447 Update code/modules/projectiles/guns/misc/chem_gun.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:18:35 -08:00
shellspeed1
b8078d0a63 Update code/modules/projectiles/guns/misc/chem_gun.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:18:29 -08:00
shellspeed1
47da4007f7 Update code/modules/projectiles/ammunition/special/syringe.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:18:04 -08:00