BlueWildrose
9437a97967
Merge branch 'Citadel-Station-13:master' into wingport
2021-12-29 15:27:08 -07:00
Lin
0ba9f4254c
Merge pull request #15435 from TripleShades/aaaaa
...
Festive Station Fixes
2021-12-28 21:35:28 +00:00
DrPainis
a43288c675
Slimes can now have wings.
2021-12-27 23:15:04 -05:00
keronshb
83a62ace04
Ambitioncheck
2021-12-23 21:15:31 -05:00
TripleShades
0089b44df2
a
2021-12-23 17:57:15 -05:00
Putnam3145
f61b638a9e
Fixes excited group process delay heuristic ( #15420 )
2021-12-22 17:38:48 +01:00
Putnam3145
97051cad80
Fixes chem gases being added twice
2021-12-22 01:27:53 -08:00
Putnam3145
b83ec40766
Fixes way too much gas being breathed
2021-12-22 01:27:40 -08:00
Lin
34dbb91d9e
Merge pull request #15433 from Citadel-Station-13/chem_synth
...
fixes debug chemical synthesizers
2021-12-21 17:22:16 +00:00
DrPainis
b224693f67
attempt 3
2021-12-20 19:42:15 -05:00
DrPainis
cd6909736e
attempt 2 at making it work
2021-12-20 19:35:23 -05:00
DrPainis
05798ef65c
makes this do something
...
probably doesn't work
2021-12-20 19:23:44 -05:00
DrPainis
5a9cf405b0
doesn't work yet
...
this is just to actually make the PR
2021-12-20 19:18:46 -05:00
LetterN
fab4b07be5
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-12-21 07:59:33 +08:00
Putnam3145
a6837e33ff
Added hydrogen to contaminated
2021-12-20 00:45:20 -08:00
silicons
03e8c32acd
Merge pull request #15402 from Linzolle/pinremoval
...
finally change pin removal from crafting to tools
2021-12-19 18:54:50 -08:00
TripleShades
226a299aff
Update dirt.dm
2021-12-19 17:29:01 -05:00
silicons
555477a075
Update chem_synthesizer.dm
2021-12-18 09:18:23 -07:00
silicons
cc11cae967
Update chem_synthesizer.dm
2021-12-18 09:17:18 -07:00
Lin
18cdbb9d5f
Merge pull request #15432 from SandPoot/assemblies
...
Fixes assemblies
2021-12-16 20:56:32 +00:00
SandPoot
67cfd000fe
Upload files
2021-12-16 12:57:21 -03:00
DeltaFire
0faac6dce6
hoo boy
2021-12-14 23:06:42 +01:00
DeltaFire
b3f0a74ff9
delay returns
2021-12-14 18:40:33 +01:00
silicons
72a169e336
Merge pull request #15426 from Putnam3145/better-science-log
...
Fixes science per-minute output
2021-12-11 17:46:22 -08:00
Putnam3145
13834847e0
it works better when you're actually using a delta
2021-12-11 17:04:05 -08:00
BlueWildrose
0e3d30e59f
Merge branch 'Citadel-Station-13:master' into wingport
2021-12-11 12:53:03 -07:00
Lin
f89729afb7
Merge pull request #15421 from DeltaFire15/more_overrides
...
Fixes even more linter stuff
2021-12-11 18:08:33 +00:00
DeltaFire
5b2f9c0745
oop
2021-12-11 18:59:02 +01:00
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
DeltaFire
1e375d86a2
cyber organ oversight & synth satiety
2021-12-09 19:09:10 +01:00
DeltaFire
eead0e6282
slow
2021-12-09 18:35:26 +01: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
8458823993
Some air alarm tweaks, as requested
...
First, filtering now filters chemicals by default, too.
Second, draught now only pressurizes up to 1.4x pressure instead of 2x--2x was too much, massive overpressure.
Third, all of the alarm types interact with siphoning vents properly. Panic siphon maximizes siphoning vents, draught sets siphoning vents to lower levels etc.
2021-12-08 12:44:39 -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
DeltaFire
50be57f107
grrrr
2021-12-08 18:33:06 +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
Cognition
3b52782ae5
Merge branch 'master' into wingport
2021-12-08 00:02:13 -07:00
Putnam3145
74ecee8253
Atmos flux event
2021-12-07 21:40:02 -08:00
Putnam3145
36c60830dd
should be rounded
2021-12-07 21:17:07 -08:00
