Commit Graph

18009 Commits

Author SHA1 Message Date
silicons 19f1e99a8c mass ports like 15 tg prs + counting (#13386)
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-10-10 12:20:33 +02:00
Timothy Teakettle 385bd57940 reworks family heirlooms, adds heirlooms that can be based off your species (#13444)
* corgi tracker

* better heirloom system

* typo
2020-10-10 12:15:39 +02:00
silicons 04db791004 Update human.dm (#13491) 2020-10-10 11:57:35 +02:00
silicons 7200f2b004 Update emote.dm 2020-10-10 02:47:28 -07:00
The0bserver 10009a39d7 Review Change Request 1 2020-10-09 09:17:28 -04:00
The0bserver 0d1d94fd06 belt 2020-10-09 01:17:46 -04:00
The0bserver 0d8bea1c9b QoL: Adds BSB's to Service, adds R.Plunger design 2020-10-08 23:27:17 -04:00
The0bserver 96c6608d59 enabled plumbing on trays. 2020-10-08 22:50:24 -04:00
Zandario 8e4c64a24b Remove clothing shito as requested 2020-10-08 18:48:26 -05:00
DeltaFire 2d684c88be readds a accidentally removed thing
Apparently, someone accidentally removed the functionality of being able to inject beakers in heaters without having to remove them, which is pretty required fore more complex reactions. This readds that.
Also tweaks the Ion release of the zeolite reaction a bit (-0.2 > -0.15)
2020-10-09 00:06:01 +02:00
Putnam3145 f561389970 Merge pull request #13539 from timothyteakettle/eye-sprites
cleans up the eye customization pr
2020-10-08 10:05:30 -07:00
Timothy Teakettle 1fc7d9a21e cleanup 2020-10-08 17:43:56 +01:00
Timothy Teakettle d37d7bddae Update jellypeople.dm 2020-10-08 04:20:42 +01:00
timothyteakettle 9d99061ff5 what the fuck git 2020-10-07 23:40:59 +01:00
Timothy Teakettle e2c6a19da7 Merge branch 'master' into slime-puddle 2020-10-07 23:37:30 +01:00
Putnam3145 64ee40b185 Merge pull request #13449 from Citadel-Station-13/silicons-patch-4
ok it turns out extools hooked procs do not play nice with call() or something so let's add admin proccall wrappers for some important atmospherics procs so i can flex the ability to undo atmospherics grief with one line of sdql2
2020-10-07 15:10:48 -07:00
Putnam3145 3edc471012 Merge pull request #13517 from Citadel-Station-13/silicons-patch-11
"are you sure we should remove mobs from the immunity typecache" v2: electric boogaloo
2020-10-07 15:07:52 -07:00
silicons 8e83dcd697 event permissions 2020-10-07 14:43:53 -07:00
silicons eda0eda754 Update movement.dm 2020-10-07 10:46:00 -07:00
Hatterhat 9928a172d0 initial commit - sabres 2020-10-06 21:58:59 -05:00
shellspeed1 2c59a5b9f8 more spelling 2020-10-06 17:36:57 -07:00
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 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 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 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
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