Commit Graph

25578 Commits

Author SHA1 Message Date
silicons
1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07:00
silicons
d2ce51ccb9 Merge pull request #13526 from Putnam3145/fix-vore-AGAIN-PLEASE
Adds a line that actually saves vore prefs to the vore pref saving
2020-10-06 17:06:08 -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
3557f00316 Merge pull request #13498 from deathride58/lingbloodupgrade
Lingblood rework (Loudness is now an average, rather than a sum)
2020-10-06 17:04:38 -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
silicons
db6e5d86d8 Merge pull request #13504 from zeroisthebiggay/yeah
buffs stands in general, adds gravitokinetic stand type from tg, fixes broken protector shield
2020-10-06 17:03:16 -07:00
silicons
eae67e38f4 Merge pull request #13509 from EmeraldSundisk/helter
Slight adjustment to the "Skelter" ruin.
2020-10-06 17:02:24 -07:00
silicons
755e539bf3 Merge pull request #13523 from Detective-Google/patch-2
fixes arcade carpet
2020-10-06 17:01:59 -07:00
silicons
df2f086c42 Merge pull request #13519 from Detective-Google/licc
licking people is now an epic radial
2020-10-06 17:01:35 -07:00
silicons
c828bd586c Merge pull request #13516 from yorii/patch-1
fixes rounding error in growthstages
2020-10-06 17:01:15 -07:00
silicons
bbc0dc982d Merge pull request #13514 from Thalpy/JacqFixes2020edition
Jacq fixes2020edition
2020-10-06 17:00:39 -07:00
silicons
f6bbfc2c88 Merge pull request #13513 from timothyteakettle/eye-sprites
adds selectable eye types to customization
2020-10-06 16:51:44 -07:00
silicons
8eac1cb939 Merge pull request #13511 from Hatterhat/hakitavolver
additional revolver sprites
2020-10-06 16:51:18 -07:00
silicons
03a47bda6d Merge pull request #13252 from timothyteakettle/loadout-loading
qol: looking at loadout equips your loadout items on you instead of job items
2020-10-06 16:50:08 -07:00
shellspeed1
3f634743e1 spelling 2020-10-06 16:27:12 -07:00
shellspeed1
2ffcdb4862 Soups on 2020-10-06 16:07:29 -07:00
DeltaFire
0d299684ed oops! 2020-10-06 21:35:08 +02:00
silicons
b341a71550 Update supermatter.dm 2020-10-06 11:52:18 -07:00
silicons
7a674fc51d Update supermatter.dm 2020-10-06 11:50:39 -07:00
Putnam
9ba798a516 Makes planetary atmos no longer superconduct. 2020-10-06 11:17:33 -07:00
Hatterhat
5a517be5e7 thanks toriate 2020-10-06 12:47:00 -05:00
Putnam3145
a2889c90f1 Merge pull request #13512 from Hatterhat/cryoscreech-fix
cant believe nobody realized the issue - fixes cryo announcements
2020-10-06 09:57:34 -07:00
DeltaFire
1285280963 empty lastline time 2020-10-06 18:31:52 +02:00
DeltaFire
21c85de81d oops! 2020-10-06 18:28:31 +02:00
DeltaFire
2cdabc039e Aaand now for the bodyparts
Title. Robo bodyparts now each have their own custom threshholds
Surplus prothetic: just bad. Very.
Cyborg: High tolerance until threshhold, but can't be well repaired once past those
Advanced Prosthetic: Relatively low threshhold, but not impacted too hard from the threshhold being passed.
2020-10-06 18:14:54 +02: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
Dip
b81d1f5994 Fully Upgraded Advanced RTG Machine Preset 2020-10-06 05:26:40 -03:00
Putnam
a1ea398283 Fixes vore saving once and for all. 2020-10-06 01:02:47 -07:00
silicons
655d505316 Merge pull request #13507 from LetterN/subsystem-updoots
Ports the better statpannel design, fixes missing icons, and fixes statvoting [ready]
2020-10-06 00:46:13 -07:00
silicons
a428311696 Update setup.dm 2020-10-05 22:05:23 -07:00
Hatterhat
2e7101fdc5 funny revolver sprites - squashed 2020-10-05 22:56:52 -05:00
Detective-Google
260ed6eff6 fixes arcade carpet 2020-10-05 21:27:42 -05:00
Fermi
f75b7a4f69 Errant comment 2020-10-06 00:22:38 +01:00
Fermi
6cc34d7779 Sneaky spans 2020-10-06 00:06:09 +01:00
Fermi
ab27d5dd30 few new barth items and span fixes 2020-10-05 23:42:00 +01:00
Fermi
bf5f755440 Oops missed something 2020-10-05 23:29:37 +01:00
Fermi
8301d3100c updates lore, runes and tgui 2020-10-05 23:03:14 +01:00
silicons
7c07863179 fix 2020-10-05 13:29:53 -07:00
silicons
5134a0ec97 Merge remote-tracking branch 'citadel/master' into lettern-git-updates 2020-10-05 10:21:46 -07:00
silicons
915d2c726b Merge pull request #13518 from TheObserver-sys/spritefixmaybe
Plant Sprite Fixes II: The Mycus must grow! (And the grass should die)
2020-10-05 10:21:37 -07:00
silicons
832f51d165 fix 2020-10-05 10:20:27 -07:00
Letter N
9819e90b30 all done 2020-10-05 20:08:55 +08:00
Letter N
1b30fbf703 Update statpanel.dm 2020-10-05 20:07:04 +08:00
Letter N
ea48dd1e2e part 2 2020-10-05 20:02:12 +08:00
Fermi
d4bc7bf562 unnessicary returns 2020-10-05 00:44:47 +01:00
Fermi
0d0b9601be Jacq can walk again! 2020-10-05 00:43:20 +01:00
Fermi
e2ff214d6b Justin hates catgirls 2020-10-04 22:31:10 +01:00
Detective Google
2840fe20b8 thank you kevinz 2020-10-04 16:06:19 -05:00