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 |
|
Putnam3145
|
6a0f371f65
|
removes a redundant variable declaration
|
2021-12-08 16:20:33 -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 |
|
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 |
|
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
|
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 |
|