Commit Graph

726 Commits

Author SHA1 Message Date
Lin e5e2e4f012 Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
2020-01-10 01:34:39 +00:00
Lin c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2020-01-10 01:31:20 +00:00
Ghommie 825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
Ghom dd6e85ddac Merge pull request #10483 from Putnam3145/fix_limbs
Fix limb damage
2020-01-09 03:04:44 +01:00
Putnam df572996b3 fix limb damage 2020-01-08 15:40:35 -08:00
Ghommie dcb2ae77fa Porting some runtime fixes. 2020-01-06 02:14:25 +01:00
Ghommie 80e716eeaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-30 18:14:47 +01:00
Ghommie 49f1176170 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-30 16:06:16 +01:00
kevinz000 74edd7b13f Merge pull request #10243 from Putnam3145/lewdchem-better-options
Lewd chem sanity pass/"ERP preferences"
2019-12-30 00:09:18 -08:00
kevinz000 310d343242 Merge pull request #10095 from Ghommie/Ghommie-cit443
Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
2019-12-30 00:03:21 -08:00
Ghommie b4c0433d6d more work. 2019-12-27 17:45:19 +01:00
Ghommie 53d142b4c0 more work. 2019-12-25 01:34:33 +01:00
Ghommie 864b768c67 Fixes digitigrades. 2019-12-23 19:36:47 +01:00
Ghommie b75349bebf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-23 04:32:09 +01:00
Ghommie e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghom aea2b8865e Merge pull request #10120 from Citadel-Station-13/night_vision
Night vision trait but it just boosts barely-lit visibility
2019-12-21 15:30:32 +01:00
Putnam f2b46f0951 ROBUST OPTING MECHANICS 2019-12-19 11:14:02 -08:00
Linzolle 70e50e57cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-17 20:21:49 -06:00
kevinz000 e496b7c397 Update eyes.dm 2019-12-15 17:02:43 -07:00
kevinz000 762cd00a5f Update eyes.dm 2019-12-15 16:55:56 -07:00
Putnam3145 c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
Artur d0493ac471 Reviewer and linter fixes, and veil tweak 2019-12-14 17:09:39 +02:00
Ghommie 7d7bcc7c34 Fixes and ready up. 2019-12-13 02:30:21 +01:00
Ghommie 8ec4bdaef5 Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs. 2019-12-13 02:30:11 +01:00
Lin a4d52454db Merge pull request #10085 from Ghommie/Ghommie-cit440
Fixes reviver implant having been a crapshot ever since soft-crit was introduced years ago.
2019-12-12 02:13:54 +00:00
Putnam3145 beddaa1a99 Merge pull request #10053 from Ghommie/Ghommie-cit429
Fixes some means of eyes blindness not working, removes legacy code.
2019-12-09 12:40:37 -08:00
kevinz000 c0f8a42e0f Update eyes.dm 2019-12-08 19:49:15 -07:00
kevinz000 c38f4989be Update eyes.dm 2019-12-08 19:45:27 -07:00
Linzolle 1e2a4f606c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-08 14:17:00 -06:00
Lin 24e4673c2b Merge pull request #10057 from Ghommie/Ghommie-cit431
fixes on_mob eyes overlays not updating properly in certain cases.
2019-12-07 21:49:18 +00:00
Artur 4711eb0987 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-07 15:53:11 +02:00
Ghommie a82e0b9ee5 Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks. 2019-12-07 09:45:38 +01:00
Ghommie 9152fe49e6 Typo. 2019-12-07 04:49:18 +01:00
Ghommie b9751006bb Fixes reviver implant having been a crapshot ever since soft-crit was introduced years ago. 2019-12-07 04:46:54 +01:00
nik707 e4a41c6169 Merge pull request #9932 from Putnam3145/fix-genital-contam
Make organs no longer radiaoctively contaminable.
2019-12-06 20:37:53 -06:00
Ghommie 4ceb0a25d0 undefined var. 2019-12-06 05:38:03 +01:00
Ghommie d6fe78f4a7 fixes on_mob eyes overlays not updating properly sometimes. 2019-12-06 03:38:39 +01:00
Ghommie 238655d599 Fixes eyes blindness a little. 2019-12-06 00:10:50 +01:00
Ghommie 53ff425f04 Banishes some magic numbers from this realm. 2019-12-05 21:55:28 +01:00
Artur f48d8016d5 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-01 13:51:57 +02:00
Putnam3145 44c621e5e9 Merge pull request #9895 from Thalpy/OrganQoL
[READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems
2019-11-30 22:22:52 -08:00
Artur 02048ce009 Bludsuckers 2019-11-29 21:28:14 +02:00
Ghommie 792f1947a7 Fixes limbs' set_disabled. 2019-11-27 19:45:27 +01:00
kevinz000 6b53845f06 Merge pull request #9268 from Thalpy/FERMICHEMCurTweaks
[READY] [Please merge me] Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
2019-11-26 16:01:48 -07:00
Linzolle cc54e5230f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-11-25 21:01:25 -06:00
BlackMajor c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
Putnam 6c51f09a82 Make organs no longer contaminable. 2019-11-23 21:14:24 -08:00
Fermi 614a462176 Revert "Revert "Merge remote-tracking branch 'upstream/master'""
This reverts commit 1509d9d183.
2019-11-24 03:33:02 +00:00
Fermi ba4fa1ef67 Revert "PLASE"
This reverts commit 8af225e6e3.
2019-11-24 03:06:08 +00:00
Fermi aeb8606ce0 Revert "Revert "PLASE""
This reverts commit 00601a0c87.
2019-11-24 03:04:52 +00:00