Commit Graph

5618 Commits

Author SHA1 Message Date
The0bserver 98f398338a belt fix and icons 2020-10-09 02:34:42 -04:00
The0bserver 0d1d94fd06 belt 2020-10-09 01:17:46 -04:00
Hatterhat 96e55d6233 the last bit 2020-10-07 17:50:21 -05:00
Timothy Teakettle e2c6a19da7 Merge branch 'master' into slime-puddle 2020-10-07 23:37:30 +01:00
Hatterhat 9928a172d0 initial commit - sabres 2020-10-06 21:58:59 -05:00
silicons 1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07:00
silicons 56a7499cef Merge pull request #13496 from Detective-Google/deadchat-kablooey
allows players in deadchat to see explosions
2020-10-06 17:05:06 -07:00
silicons 3fa0bf37ff Merge pull request #13501 from Putnam3145/fix-firelocks
Made holofirelocks work.
2020-10-06 17:04:01 -07:00
silicons efc4e089c9 Merge pull request #13503 from Hatterhat/glaive-knuckledagger
survival daggers, luxpod capsule resprite, glaive sprite tweaks soon (tm)
2020-10-06 17:03:44 -07:00
DeltaFire 06cb91ca3d updates all BODYPART_ORGANIC occurances
:)
2020-10-06 18:01:25 +02:00
DeltaFire 4146566af0 hoo boy
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
2020-10-06 17:34:13 +02:00
Detective-Google 260ed6eff6 fixes arcade carpet 2020-10-05 21:27:42 -05:00
Detective Google 6d14d37e5f adds deadchat span 2020-10-04 13:34:36 -05:00
silicons 9faff5ecb6 Merge pull request #13461 from Detective-Google/arcade-carpets
adds arcade carpets
2020-10-03 18:07:44 -07:00
silicons 27ae95dd26 Merge pull request #13499 from Putnam3145/toilet-loot-fix
Makes toilet loot not exist to cause bad GC bugs.
2020-10-03 18:07:10 -07:00
silicons 7586c38d52 Merge pull request #13487 from DeltaFire15/borg-KA-upgrade-fix
Fixes borg KA upgrade installation
2020-10-03 18:03:11 -07:00
silicons 0393ffe0c3 Merge pull request #13489 from timothyteakettle/species-color-define
standardizes minimum brightness of mutant parts
2020-10-03 14:21:20 -07:00
silicons 6a8814cd1e Merge pull request #13484 from DeltaFire15/plushling-fix
Fixes plushlings
2020-10-03 14:20:33 -07:00
Hatterhat 4195f96876 glaive daggers squashed 2020-10-03 14:32:19 -05:00
Putnam 138794378d Made holofirelocks work. 2020-10-02 22:34:05 -07:00
Putnam 29213bbcbe ok i guess it has to be initialize 2020-10-02 17:39:53 -07:00
Putnam 3b21c31872 Makes water closet loot work and not cause bad GC bugs. 2020-10-02 16:56:21 -07:00
Detective Google 52e8e2996c allows players in deadchat to see explosions 2020-10-02 14:26:11 -05:00
timothyteakettle 950cb05617 Merge remote-tracking branch 'upstream/master' into slime-puddle 2020-10-02 15:53:48 +01:00
Tupinambis d2860b38c7 normalization 2020-10-01 18:46:31 -05:00
Tupinambis f1bc1ccafb Merge branch 'master' into spooder
# Conflicts:
#	code/modules/surgery/organs/eyes.dm

I have no idea if this will work
2020-10-01 17:10:42 -05:00
silicons f6dccd5ac5 Merge pull request #12439 from timothyteakettle/cool-ipcs
makes ipcs more like robots (a partial port from skyrat)
2020-10-01 14:15:04 -07:00
Timothy Teakettle 7726b0456c Merge branch 'master' into cool-ipcs 2020-10-01 21:06:16 +01:00
Detective Google 57132d0b32 Merge remote-tracking branch 'upstream/master' into clothing 2020-10-01 14:06:21 -05:00
Detective Google 98703e6ad6 Merge remote-tracking branch 'upstream/master' into arcade-carpets 2020-10-01 13:41:10 -05:00
Timothy Teakettle e1123ad7fe color define 2020-10-01 18:55:32 +01:00
DeltaFire e012b8f082 typo 2020-10-01 17:18:28 +02:00
DeltaFire d54a899695 fixes KA modkits being installed in borgs by others
These have been broken for so long holy fuck
2020-10-01 17:13:03 +02:00
silicons c8d6f3d22a Merge pull request #13477 from LetterN/patch-2
Adds craftable railings
2020-10-01 03:13:51 -07:00
silicons d8e58b1c48 Merge pull request #13452 from Tupinambis/CarbonHydrogenBromine
Ascent Port Project: Methane and Methyl Bromide Gas Additions
2020-10-01 03:13:15 -07:00
silicons 38c25bdc9d Merge pull request #13466 from Putnam3145/sdgf-fix
Cleans up and fixes SDGF code a bit, consistent naked clones, transfer_ckey resets view range
2020-10-01 03:07:08 -07:00
silicons 7553508a2a Merge pull request #13455 from Putnam3145/pyroclastic-policy
Added policy config for sentient pyro slimes (no actual policy yet)
2020-10-01 03:06:03 -07:00
silicons 47aef0d574 Merge pull request #13443 from ItzGabby/gabby-wooden-floors
Gabbys new wooden floor tile types
2020-10-01 03:04:21 -07:00
silicons 8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
Letter N c7875f2792 commit 3 2020-10-01 12:54:49 +08:00
Letter N d9ab31e199 commit 2 2020-10-01 11:30:01 +08:00
Detective Google c4480afc09 Adds a bunch of RP clothes and ports the detvendor 2020-09-30 20:50:00 -05:00
Tupinambis 0bb889932d Completed! 2020-09-30 19:05:56 -05:00
Tupinambis 113b84ab50 Ports arachnids from WaspStation 2020-09-30 15:10:17 -05:00
timothyteakettle ccb774b8f2 puddles 2020-09-30 02:15:34 +01:00
Putnam 8a01b949bf Cleaned up SDGF and consistencised clones. 2020-09-29 03:47:09 -07:00
Detective Google 643421bc23 adds arcade carpets
yay
2020-09-28 14:43:03 -05:00
Tupinambis f552459f4a 13->14 distro 2020-09-27 17:28:50 -05:00
Putnam 4252ef606d Added policy config for sentient pyro slimes (no actual policy) 2020-09-27 15:28:24 -07:00
Tupinambis d2500fe389 Adds Methane and Methyl Bromide 2020-09-27 15:15:58 -05:00