silicons
004e91c743
Merge pull request #15602 from Putnam3145/lavaland-more-atmos
...
Allow planets to have fuel-based atmospheres
2022-04-27 16:11:15 -07:00
Timothy Teakettle
ac4a41243a
add salt quirk
2022-04-27 14:58:54 +01:00
BongaTheProto
ffec4796fd
Stations update + portal panties fix (?)
...
- Updates tau and smol
- fixes a supposed runtime with portal panties
We haven't had problems with them so far so I'm scared this may just fuck them up. Always worth the try though
2022-04-26 23:12:03 -05:00
Timothy Teakettle
2d433e71de
grammar
2022-04-26 15:07:58 +01:00
Putnam3145
68e3c33248
Make the sanity check more sane
2022-04-25 21:52:22 -07:00
Putnam3145
621b974691
Allow planets to have fuel-based atmospheres
2022-04-25 20:27:01 -07:00
Iosyf
4e2945bf5a
ignore this
...
Redundancy fix
2022-04-26 00:26:45 +03:00
Timothy Teakettle
537e72a657
Update trash.dm
2022-04-24 23:38:50 +01:00
Iosyf
847472486d
Runtime Ironing out (mostly null checks)
...
checking for nulls in:
flavor_text.dm
new_player.dm
coiling.dm
tgyu,dm
lewd_shoes.dm
storage.dm
milking_machine.dm - for some reason tried calling /obj/effect/decal/cleanable/semen/getorganslot() (line 81)
2022-04-23 19:47:52 +03:00
BongaTheProto
479b497b00
ok
2022-04-19 01:30:44 -05:00
AManWithAToolbox
dda0869f82
Merge branch 'pr/1' into its-wasnt-gonna-happen
2022-04-18 23:19:18 -05:00
BongaTheProto
6ada3f7c94
Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen
2022-04-18 21:36:14 -05:00
SandPoot
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
silicons
da09439093
Merge pull request #15585 from SandPoot/Initialize(mapload)
...
Every case of initialize that should have mapload, does
2022-04-15 17:41:57 -07:00
SandPoot
13fb647b9e
Update files ( #15597 )
2022-04-15 16:31:50 +02:00
BlueWildrose
f235839351
Adds carcinisoprojection jelly, a limb regrowth chem that is made from slime mutation toxin & blood ( #15053 )
...
* Limb regrowth chem, new disease of crab cancer
* Limb regrowth adjustments
* oops, sorry linters.
* oh right this would probably fuck with dullahans
* woops missed a newline
* Update code/modules/reagents/chemistry/reagents/medicine_reagents.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
* just realized this check is unnecessary.
* let's add a mood debuff while we're at it
* Update medicine_reagents.dm
* add a bounty
* misspelling
* Update crabcancer.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
2022-04-15 00:37:08 +02:00
nullfag
a4c5fa6912
"modularity" fix
2022-04-15 00:37:05 +02:00
nullfag
ea17a468a8
naked flavor text
2022-04-15 00:37:05 +02:00
BongaTheProto
a4fac709c3
Merge remote-tracking branch 'upstream/master'
2022-04-09 11:43:45 -05:00
SandPoot
2555843026
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 03:06:56 -03:00
SandPoot
9df4ed8253
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:48:16 -03:00
SandPoot
ada0ea7f32
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:40:23 -03:00
Lin
fd286c325e
Merge branch 'master' into Projectile_Rework
2022-04-09 04:19:56 +00:00
SandPoot
695835fcd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 00:03:13 -03:00
silicons
dee1db4a3a
Merge pull request #15558 from SandPoot/mechs-are-vehicles
...
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
BongaTheProto
10eb587407
Merge remote-tracking branch 'upstream/master'
2022-04-08 13:46:43 -05:00
SandPoot
31a179f95d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-08 13:57:46 -03:00
silicons
904990a037
Merge pull request #15584 from Arturlang/StasisBeds
...
Stasis beds
2022-04-08 09:47:26 -07:00
Artur
be46eba465
Moves stasis handling to component-based
2022-04-07 14:10:51 +03:00
Solaris-Shade
48db01702b
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-04-06 22:31:51 -04:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
BongaTheProto
f5af499eee
Merge branch 'Sandstorm-Station:master' into master
2022-04-06 16:01:25 -05:00
SandPoot
66b05f5261
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-06 16:40:58 -03:00
silicons
c8cab13081
Merge pull request #15565 from SandPoot/custom-statues
...
Custom statues and sculpting changes.
2022-04-06 12:12:24 -07:00
Artur
c36019bf56
Adds stasis beds
2022-04-06 15:38:05 +03:00
BongaTheProto
5a6b1b9dc7
Merge branch 'Sandstorm-Station:master' into master
2022-04-01 19:42:35 -05:00
SandPoot
c8df97474b
Adds pick-up, drop and throw sounds for items. ( #240 )
2022-04-01 15:57:30 -03:00
Putnam3145
7ebd03e049
Adds beauty back
2022-03-30 15:45:27 -07:00
Putnam3145
90288b00e7
also removed silicons from the list, whoops
2022-03-30 12:51:27 -07:00
Putnam3145
9169881694
Robots can't be hungover either
2022-03-30 12:40:26 -07:00
Putnam3145
6199aa4d60
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
2022-03-30 12:35:12 -07:00
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
BongaTheProto
520c3f7da3
Merge remote-tracking branch 'upstream/master'
2022-03-23 07:26:49 -05:00
Solaris-Shade
5596b04f5c
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-22 20:37:16 -04:00
SandPoot
ef567c0947
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-03-22 18:00:53 -03:00
BlueWildrose
ac1c3511b1
Advanced mutation toxin nerf; new cure, removes instant subspecies transformation ( #15497 )
...
* Advanced mutation toxin nerf
* Adv Mut Toxin nerf fix - needs all cures to FALSE
2022-03-22 17:17:18 +01:00
Solaris-Shade
fb4e27e536
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-21 17:21:14 -04:00
BongaTheProto
a1a3b3fc93
Merge remote-tracking branch 'upstream/master'
2022-03-20 21:24:52 -05:00
SandPoot
e64a988cda
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-03-20 19:49:11 -03:00
Lin
22a49c1dd7
Merge pull request #15564 from SandPoot/bad-getatomonturf
...
Fixes balloon alerts sourced on turfs
2022-03-20 22:30:34 +00:00
