Commit Graph

29484 Commits

Author SHA1 Message Date
LiteralMushroom
41fe2105f8 that didn't work 2022-01-10 18:57:47 -05:00
LiteralMushroom
239782e74a maybe makes it compile 2022-01-10 18:52:16 -05:00
LiteralMushroom
fe82ab2504 Update code/modules/mob/living/carbon/human/innate_abilities/customization.dm
Finally.

Co-authored-by: Poojawa <Poojawa@users.noreply.github.com>
2022-01-10 18:47:13 -05: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
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
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
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
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
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
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
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
Linzolle
c2378d3f26 helmet stuff 2021-11-29 17:40:08 -07:00
Linzolle
9807a2f9e0 pin removal and gun examine things 2021-11-29 17:22:13 -07: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