SandPoot
73da7b6e03
flavor_Text != flavor_text
2022-05-20 00:00:42 -03:00
SandPoot
da1f58f297
Update files
2022-05-19 13:23:17 -03:00
Lin
a899b5db81
Merge pull request #15607 from Putnam3145/auxmos-1
...
Updates auxmos to 1.0 (plus other atmos stuff with it)
2022-05-13 05:45:33 +00:00
silicons
73741102ac
Merge pull request #15606 from timothyteakettle/salt-quirk
...
an actual salt pr (adds sodium sensitivity quirk)
2022-05-02 17:02:23 -07:00
Putnam3145
a7408beb4c
Updated auxmos to 1.0
2022-04-28 21:07:51 -07:00
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
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
Timothy Teakettle
537e72a657
Update trash.dm
2022-04-24 23:38:50 +01: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
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
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
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
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
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
Solaris-Shade
5596b04f5c
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-22 20:37:16 -04: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
Lin
22a49c1dd7
Merge pull request #15564 from SandPoot/bad-getatomonturf
...
Fixes balloon alerts sourced on turfs
2022-03-20 22:30:34 +00:00
Solaris-Shade
d9ff37d2ff
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-19 11:23:16 -04:00
SandPoot
16fddbb140
Upload files
2022-03-18 18:35:29 -03:00
SandPoot
3ee2d12b34
Upload files
2022-03-18 12:45:07 -03:00
SandPoot
96e38e965b
Merge branch 'master' into mechs-are-vehicles
2022-03-17 22:23:48 -03:00
SandPoot
4da5a57688
global
2022-03-16 18:33:32 -03:00
SandPoot
25bcad7be8
Update code/datums/components/armor_plate.dm
2022-03-16 18:06:25 -03:00
SandPoot
baee52349b
Upload files
2022-03-16 15:41:07 -03:00
SandPoot
a8f454bd72
Upload files
2022-03-16 14:00:31 -03:00
silicons
861a9f854f
Merge pull request #15476 from DeltaFire15/core-alt-pr
...
Buffs regen core healing for robots on lavaland, nerfs regen cores when not on lavaland
2022-03-13 14:26:06 -07:00
Solaris-Shade
0395ba47d7
Merge branch 'master' into Projectile_Rework
2022-03-11 23:07:31 -05:00
Solaris-Shade
2fdb70b2b9
[DNM][DNM][WIP] Projectile backend code port and update
...
Ports#54924, #65061 , #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
Lin
ae5896d6cf
Merge pull request #15525 from keronshb/ambitioncheck
...
Ambitions from Skyrat
2022-02-27 02:34:13 +00:00
keronshb
1415b9580f
Last fixes
2022-02-25 22:29:09 -05:00
SandPoot
f7ea1f377d
oops, replace all is a hell of a drug
2022-02-25 17:09:31 -03:00
SandPoot
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
keronshb
3ea22f97a6
Merge remote-tracking branch 'upstream/master' into ambitioncheck
2022-02-22 17:10:25 -05:00
silicons
ce6e8c99c6
fixes
2022-02-15 21:56:36 -07:00
keronshb
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05:00
silicons
af6e43c595
refactors clickcatchers/parallax/fullsceren ( #15460 )
...
* :)
* that
* move those there
* refactor that too
* wew
* stuff
* almost.
* sigh
* just need speed
* stuf
* pain
* hm
* tweaks
* that
* eh
* wack
* a
* done
* that's important
* wacky
* all that
* fixes
* typo
* that
* a
* funny
* that
* that
* woo
* help im losing my fucking mind
* okay
* fix
2022-02-07 15:17:24 -08:00
SandPoot
7e970fe5f1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into changelogs-tgui
2022-02-04 13:06:20 -03:00
silicons
c0e097f589
Merge pull request #15484 from DeltaFire15/adaptation
...
Space Adaptation nulls low-pressure cooling penalties of passive cooling for Synthetics.
2022-02-04 07:58:44 -08:00
