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

29466 Commits

Author SHA1 Message Date
Lin
d2a91c37b7 Merge pull request #15415 from bunny232/master 
The pool's safe temperatures are now within a somewhat reasonable range.
 2021-12-10 18:42:52 +00:00
Lin
bb1de6070e Merge pull request #15416 from bunny232/tempfeel 
Hey what if cold blooded people didn't get a permanent too-hot alert if their body is the same temperature as the air around them
 2021-12-10 17:44:48 +00:00
Lin
c7d4c29a37 Merge pull request #15422 from Putnam3145/gases-fix-what 
Removes a redundant variable declaration
 2021-12-10 17:44:13 +00:00
Lin
c1dc8b2c2a Merge pull request #15418 from Putnam3145/better-science-log 
Makes science points show actual change in last minute instead of just passive gen
 2021-12-10 03:46:06 +00:00
Lin
a9c12e3762 Merge pull request #15424 from SandPoot/centralize-borg-speech 
Centralizes dogborg speech even inside something
 2021-12-10 03:44:43 +00:00
SandPoot
30426ad011 Upload chatmessage.dm 2021-12-08 23:36:42 -03:00
Putnam3145
f21be027d0 am i just eternally wrong 2021-12-08 16:26:34 -08:00
Putnam3145
6a0f371f65 removes a redundant variable declaration 2021-12-08 16:20:33 -08:00
Putnam3145
5ff8d7c356 grammar unfix 2021-12-08 12:02:07 -08:00
Timothy Teakettle
a0aec75c23 being fat no longer makes you slower when floating (#15344) 
* Update mobs.dm

* Update code/modules/movespeed/modifiers/mobs.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-12-08 19:11:16 +01:00
keronshb
6ab0d1b70c Adds Clock Cult to the midround pool. (#15338) 
* Midround Clock Cult

Adds midround clock cultists

* Is eligible

* Reebe load proc

* Moves load reebe

* One tab out
 2021-12-08 19:06:11 +01:00
Lin
76fbc0994f ball map weather (#15405) 2021-12-08 18:49:43 +01:00
bunny232
da5140e1ca Update code/modules/mob/living/carbon/human/species.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-12-08 05:21:52 -05:00
bunny232
3f3ccadde5 Merge branch 'Citadel-Station-13:master' into tempfeel 2021-12-08 05:21:22 -05:00
bunny232
4904f45b7c Merge branch 'Citadel-Station-13:master' into master 2021-12-08 05:21:06 -05:00
Putnam3145
36c60830dd should be rounded 2021-12-07 21:17:07 -08:00
Putnam3145
db4c9c1b06 Makes science points show actual change 2021-12-07 21:12:46 -08:00
DeltaFire
f0ff064dc1 missed a line 2021-12-08 05:12:32 +01:00
DeltaFire
04797a961b linters b gone 2021-12-08 05:07:22 +01:00
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
3084ef1231 areas and power and atmos oh my 2021-11-26 20:50:39 -07:00
Linzolle
776f69e119 turfs go in the turfs file and it is too cold 2021-11-26 19:53:33 -07: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
5498d7ed13 Reverts unintended area changes to other maps 2021-11-21 10:50:22 -05:00
Chayse Ramsay
31a0de04d5 Fixes chem nades too, since fixing grenades as a whole broke them changing timer 2021-11-21 06:24:55 +00:00
Chayse Ramsay
9545b180c6 Update grenade.dm 2021-11-21 06:08:20 +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
Lin
1de965a90e Merge pull request #15385 from buffyuwu/crayons.dm 
dont color my entire canvas neon green when im painting please
 2021-11-20 03:36:38 +00:00
Lin
d395824007 Merge pull request #15383 from MrJWhit/thinnining-trash 
Thins up the loot piles
 2021-11-20 03:35:56 +00:00
Lin
43e4c71d04 Merge pull request #15384 from SandPoot/acid-bgone 
Acid overlay no longer lingers after done
 2021-11-19 23:02:49 +00:00
Artur
99dedb54ed Merge remote-tracking branch 'upstream/master' into admin_mapsave 2021-11-20 00:16:56 +02:00
Putnam3145
cf4cc39a3b Merge pull request #15222 from raspy-on-osu/apcfix 
save hours of pain for new engineers with this one simple trick!! click here to find out
 2021-11-18 20:18:11 -08:00
buffyuwu
612087f7e5 Update crayons.dm 2021-11-18 20:44:01 -05:00