Commit Graph

25054 Commits

Author SHA1 Message Date
DeltaFire
d0247bdb3b modifies heretic sac husking a bit
The husking caused by heretic sacrifices is not healable with synthflesh. In exchange, the sacrificed humanoid suffers 200 additional burn damage, making them ever so slightly harder to immediately restore.
2020-09-27 05:35:33 +02:00
SiliconMain
84f240c5dd Update holosign.dm 2020-09-25 09:50:08 -05:00
Putnam3145
f6d9d4b535 Merge pull request #13426 from CoreFlare/master
Gives IPCs hair.
2020-09-24 21:40:41 -07:00
Putnam
6f6e330984 Removes removeNullsFromList, cause it doesn't work. 2020-09-24 01:15:22 -07:00
silicons
7ca1b1dc79 Merge pull request #13380 from Putnam3145/cache-locality-experiments
(TESTMERGE THIS FIRST WOW) Made monstermos faster and more convenient
2020-09-23 14:39:56 -07:00
Putnam3145
c41add450a Merge pull request #13425 from Arturlang/TGUI_Updoot
Fixes some statpanel Issues
2020-09-23 14:19:22 -07:00
CoreFlare
1901677fdb finally. species_traits=list(HAIR) 2020-09-23 19:11:34 +01:00
Artur
e483cf06b3 fIXD 2020-09-23 19:54:30 +03:00
Artur
d493886875 Speedmerge fix 2020-09-23 19:14:50 +03:00
Putnam
2e877b8c50 Hardcoded fusion scan results as "fusion" to fix a runtime.
It didn't need to be id anyway??
2020-09-22 00:23:13 -07:00
Putnam
e89e7adda4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments 2020-09-21 03:31:35 -07:00
silicons
90aa47f339 Merge pull request #13329 from Arturlang/TGUI_Updoot
TGUI updates + statpanel
2020-09-21 03:11:06 -07:00
Artur
410550220b Fixed admin hide most verbs 2020-09-21 10:39:09 +03:00
silicons
8de3bcb08f Merge pull request #13402 from timothyteakettle/limbs
copying prefs always regenerates icons now (attempt to stop preview icons being outright wrong)
2020-09-20 21:30:08 -07:00
silicons
26eebf3b32 Merge pull request #13408 from YakumoChen/dont-be-a-dick-shinji
Get in the damn robot, Skylar
2020-09-20 21:24:08 -07:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Ghom
b29143ea03 Merge pull request #13364 from Citadel-Station-13/silicons-patch-34
projectile process invoke async because people keep breaking shit and trying to enforce do not sleep on it is a moot point because people keep breaking shit
2020-09-19 16:53:55 +02:00
Putnam3145
62228905da Merge pull request #13382 from Citadel-Station-13/silicons-patch-36
hulks no longer break their hand from punching a wall
2020-09-19 06:07:04 -07:00
Putnam3145
9c305d1db6 Merge pull request #13400 from silicons/shields
adds two procs to find exterior tiles for projecting hull shields around for later pr
2020-09-19 06:06:46 -07:00
Putnam3145
ccbacfb0bf Merge pull request #13403 from Citadel-Station-13/silicons-patch-38
fixes joystick users getting kicked for hacking. again.
2020-09-19 06:05:25 -07:00
Ghom
868e464b40 fixes linter issues, removes acid degrading armor (#13399)
* fix

* more

* Update brawn.dm

* Update ticketmachine.dm
2020-09-19 15:04:48 +02:00
Putnam3145
e52ba8d883 Merge pull request #13406 from Citadel-Station-13/silicons-patch-39
fixes airlock wire runtimes from non-user wire damage
2020-09-19 06:04:31 -07:00
silicons
54f48c3754 Merge pull request #13394 from DeltaFire15/attack-runtime-fixes
Some bodypart-related fixes
2020-09-19 06:02:32 -07:00
YakumoChen
85f8c22da9 adds mech suits to robodrobe 2020-09-18 21:16:25 +00:00
YakumoChen
9c7b43a83b mech suits 2020-09-18 21:13:08 +00:00
silicons
b9315c5080 Update airlock.dm 2020-09-18 04:26:22 -07:00
silicons
59372710bb Update keybindings.dm 2020-09-17 21:41:05 -07:00
silicons
3629addf0f Update ticketmachine.dm 2020-09-17 04:37:10 -07:00
silicons
872ef07b43 Update brawn.dm 2020-09-17 04:36:39 -07:00
Artur
74533d3f9d fiiix shit 2020-09-16 11:16:39 +03:00
silicons
49333833a4 debugging done 2020-09-16 00:44:57 -07:00
silicons
ca8b13b86a Merge pull request #13255 from timothyteakettle/limbs
you can choose limbs to be prosthetic/amputated
2020-09-16 00:31:18 -07:00
silicons
17b21d29f3 helpers 2020-09-16 00:07:33 -07:00
silicons
7f145b7948 Merge pull request #13388 from DeltaFire15/plush-ling
Adds peculiar plushies, which are made by failing to make plushmium
2020-09-15 17:31:18 -07:00
silicons
39d3a4f596 Merge pull request #13362 from Putnam3145/fix-fuid-production
Fixes organ fluid production.
2020-09-15 17:30:46 -07:00
silicons
97c27b30f5 Merge pull request #13365 from DeltaFire15/tendril-stuff-fixes
Hey wait isn't there numbers between 11 and 15
2020-09-15 17:30:06 -07:00
silicons
cffc321050 more 2020-09-15 17:27:50 -07:00
silicons
95ebeac5b6 fix 2020-09-15 17:27:11 -07:00
Artur
1c831692a7 Properly fixed altclick 2020-09-16 00:41:47 +03:00
Timothy Teakettle
e67fbed1ba always regenerate icons 2020-09-15 18:37:14 +01:00
DeltaFire
f892309903 fixes 2020-09-15 17:35:58 +02:00
Putnam
b06f19cf5c Brought reactions to extools again; now including debug symbols.
This time they work!
2020-09-14 19:32:31 -07:00
Putnam
f13af9f72e Made gases only display in analyzers if they have at least 0.005 moles. 2020-09-14 02:37:47 -07:00
Putnam
372be3bf5c Fixed all the problems. 2020-09-14 02:37:07 -07:00
DeltaFire
bd183e8e28 removes an unneeded check 2020-09-13 13:27:57 +02:00
DeltaFire
8975b93b37 no petting and not petting at the same time 2020-09-13 03:43:31 +02:00
DeltaFire
2d8655d712 plushie shapeshifter 2020-09-13 03:25:43 +02:00
Timothy Teakettle
744792742b please fix it 2020-09-12 22:32:06 +01:00
DeltaFire
9e3710bb51 kev request
malf disk gone from the /misc chest type
2020-09-11 23:19:55 +02:00
silicons
ad128c292e Merge pull request #13351 from Trilbyspaceclone/patch-402
Correrts open loop on race drinks
2020-09-11 14:16:33 -07:00