Commit Graph

270 Commits

Author SHA1 Message Date
KeplerWasTaken
2be7035ea3 Sentience Transferring into mobs now adds a heart icon aswell 2023-01-22 14:30:22 +01:00
KeplerWasTaken
1c508eeb30 Sentient mobs will now receive a heart icon to display that they're sentient 2023-01-21 18:50:49 +01:00
SandPoot
da1df79599 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-07-20 23:30:31 -03:00
SandPoot
75dd6a67df just a little check for if there's anything at all 2022-07-19 21:32:49 -03:00
SandPoot
05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -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
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
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot
fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
SandPoot
a0c181a721 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-04 15:13:32 -03:00
DeltaFire
04d806c700 orange
stabilized orange can now cool at most 5 per tick instead of infinite

robots only cool half, which means 5 per life tick (status effects fire twice per life tick total)

for robots, it cools towards ~ -100°C target temp, provided you are in a location that supports it.
2022-01-31 00:50:22 +01:00
SandPoot
72db0e8ef2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-11 17:20:05 -03:00
SandPoot
ca74834260 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-08 15:17:23 -03:00
DeltaFire
50be57f107 grrrr 2021-12-08 18:33:06 +01:00
DeltaFire
04797a961b linters b gone 2021-12-08 05:07:22 +01:00
SandPoot
f1f6ac0109 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-31 22:14:23 -03:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
32a6e63698 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-27 23:11:54 -03:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
SandPoot
1b851c4826 Thirst rework (#184) 2021-10-02 22:29:34 -03:00
SandPoot
e7d5275a70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-20 14:32:29 -03:00
Cognition
37c480a7a4 1 second for self-use 2021-09-17 23:12:55 -07:00
Cognition
cd747b01fe realized I can't place it on tables with how I set it up, woops. 2021-09-17 02:59:31 -07:00
Cognition
db511f4d7e Regenerative extract nerfing 2021-09-17 02:23:06 -07:00
SandPoot
75fa42f7c5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-31 15:59:51 -03:00
Cognition
a03abc5658 forgot unscrew updating, adds appearance updating to stabilized yellow slime extract 2021-08-28 20:25:43 -07:00
SandPoot
dfe4a91219 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-11 13:06:19 -03:00
silicons
51dbc8e21f Merge pull request #14685 from Arturlang/fake_blood
Reworks blood regeneration into something a bit more tame
2021-08-11 02:54:49 -07:00
SandPoot
ab9b824ce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-08 14:18:09 -03:00
Artur
5acd7fef2d makes salglu not deadly 2021-08-02 21:54:47 +03:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Artur
2adfbea215 Merge remote-tracking branch 'origin/master' into fake_blood 2021-07-23 18:50:09 +03:00
SandPoot
86ad617daa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-22 12:40:18 -03:00
silicons
3070f178e0 Merge remote-tracking branch 'citadel/master' into combat_patches_1 2021-07-18 15:12:52 -07:00
SandPoot
9d701320ac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-15 11:54:42 -03:00
Putnam3145
899e74fc83 Componentized acid 2021-07-03 22:10:44 -07:00
silicons
4653deddec updates 2021-06-28 12:55:22 -07:00
SandPoot
d863f9f437 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-27 15:54:58 -03:00
Putnam
86177c51c4 auxgm part 1
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
SandPoot
38492780b9 Allows fireproofing potion to be used on anything (#163) 2021-06-03 16:10:54 -03:00
Artur
35bfba1f6a Redoes the variable changes into procs 2021-05-05 18:15:13 +03:00
Artur
92e6646a4c time to make blood even more pain 2021-05-05 14:44:21 +03:00
SandPoot
6f15641f33 Thirst (#151)
* upload files

* upload files

* upload examine.dm

* Update modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
2021-04-03 19:54:56 -03:00
silicons
3f4aff09d1 Update code/modules/research/xenobiology/crossbreeding/_status_effects.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-02-05 00:59:19 -07:00
silicons
503d71ea45 Update _status_effects.dm 2021-01-31 18:03:36 -07:00
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
silicons
fd77be9b89 Update _status_effects.dm 2021-01-09 16:44:56 -07:00