Commit Graph

464 Commits

Author SHA1 Message Date
Fermi f03c9c236d Compile fixes and tweaks. 2019-09-10 18:54:47 +01:00
Fermi 018ebc32ae All that remains is MK testing. 2019-09-08 02:46:43 +01:00
Fermi d90b4769f1 MK, SDGF, Astrogen, Eigen, BE, furranium, hattmium tweaks and fixes. 2019-09-05 22:30:53 +01:00
Fermi 7890ad08d5 what is this 2019-09-03 20:30:21 +01:00
Fermi a605d2a776 Todo: finish new words and review langauge 2019-09-03 20:16:41 +01:00
Thalpy 9c7b1dee97 Merge branch 'master' into master 2019-07-15 21:23:04 +01:00
Fermi 8d12d0f017 I am very smart 2019-07-13 20:02:53 +01:00
Fermi 6c9f37790b Fixing bugs from merge conflicts. 2019-07-13 20:02:27 +01:00
Thalpy 4c4dbd0e17 Merge branch 'master' into master 2019-07-13 19:33:46 +01:00
Fermi 110f0cbb83 Fixes and making a message clearer so people don't think it's admins. 2019-07-13 19:17:19 +01:00
Ghommie 129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
kevinz000 13b1e5d409 Merge pull request #8812 from Sishen1542/surgery-hugboxing
Using the wrong tool during surgery won't hit the patient with it. Also stops medical borgs from attacking with surgical tools outside of harm intent.
2019-07-12 07:42:11 -07:00
kevinz000 1eaddd3ebf Merge pull request #8853 from Ghommie/Ghommie-cit125
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
2019-07-12 07:34:19 -07:00
Fermi 8f555b0fdd Reworked Astral, doubled lung damage, fixed lung damage oopsie. 2019-07-10 21:35:47 +01:00
Fermi ce390fb595 Tweaks to MK 2019-07-09 23:27:37 +01:00
Ghommie 490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Thalpy c418312cc6 Merge branch 'master' into master 2019-07-09 05:33:09 +01:00
Fermi 1b3de620f9 BM requests. 2019-07-09 02:44:17 +01:00
deathride58 e56fc559ed Merge pull request #8748 from Citadel-Station-13/kevinz000-patch-15
Raises corpse miasma generation by 5x. Lowers miasma disease chance per mole by 10x. Miasma now does absolutely nothing unless there's enough of it in the air to actually flow into scrubbers so there's no invisible pockets of disease stuck everywhere.
2019-07-08 18:15:20 -04:00
deathride58 42cee552fe Merge pull request #8709 from Trilbyspaceclone/Fel_port_1
Ports "Fixes every issue in the slimes milestone. #44450"
2019-07-08 18:10:46 -04:00
deathride58 840cfb8ac0 Merge pull request #8818 from Citadel-Station-13/kevinz000-patch-53
fixes stimulum by changing one number
2019-07-08 17:54:56 -04:00
Fermi d870604322 Missed one 2019-07-08 19:59:51 +01:00
Fermi c3ac34158a Fixed shock command. 2019-07-08 19:51:10 +01:00
kevinz000 1b4df74efb Merge pull request #8802 from Ghommie/Ghommie-cit101
Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.
2019-07-07 02:39:07 -07:00
Fermi e84fc73bed Fixed buffers, SDGF, icons and spelling. 2019-07-07 05:59:21 +01:00
Thalpy 8a6e669060 Merge branch 'master' into master 2019-07-04 03:14:29 +01:00
kevinz000 8a4d7afca2 Update lungs.dm 2019-07-03 03:55:27 -07:00
Fermi 27aad8f117 Quick in case. 2019-07-02 22:42:07 +01:00
Sishen 67a602fd79 hugboxed surgery, works for borgs 2019-07-02 06:26:07 -04:00
Thalpy 3c8025c477 Moving computers 2019-07-01 13:56:37 +01:00
Ghommie f39a5d2f6a Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix. 2019-06-30 21:53:33 +02:00
TrilbySpaceClone 9d6c930b2c owo
Wat dis?
2019-06-30 15:47:45 -04:00
Thalpy 937d6467e6 Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_ 2019-06-30 19:16:27 +01:00
Thalpy 538e0fad29 Oops 2019-06-30 02:06:30 +01:00
Thalpy e09f189895 WELCOME TO PH'S HELL RIDE 2019-06-30 01:56:10 +01:00
Thalpy 696d879874 Merge branch 'master' into master 2019-06-29 15:48:25 +01:00
Thalpy 7be7f05228 Reduced pent, tweaked pH, tweaked MK, added beaker tally. 2019-06-29 08:50:20 +01:00
kevinz000 c495a2aa47 Merge pull request #8739 from Sishen1542/makinggolemsgreatagain
Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!
2019-06-28 20:32:15 -07:00
Thalpy 4b7ac0be79 More fun ssblackbox tallies. 2019-06-28 16:50:48 +01:00
Thalpy a2a5bbdb11 Found the "the floor" message admin! 2019-06-26 19:40:46 +01:00
Fermi afe43070a0 Improved logging and renamed buffer IDs 2019-06-26 12:20:10 +01:00
kevinz000 45842ebda7 Update lungs.dm 2019-06-25 01:38:26 -07:00
kevinz000 626ec64c1c Update lungs.dm 2019-06-25 01:34:19 -07:00
Fermi 4145b0f256 Hotfix for egregious oversights. 2019-06-25 07:22:20 +01:00
Fermi 8605d3a246 Found a pH overflow. 2019-06-24 15:06:18 +01:00
Fermi 10109d0fe5 Merge branch 'pr/18' 2019-06-23 19:15:07 +01:00
Fermi 8992dbfa4d Commented out hypnoquirk and edited it so that it functions differently 2019-06-23 18:59:15 +01:00
Ghom d4a13077ff ports in "Adds radial menu to arm-mounted implants" (#8733) 2019-06-23 06:01:09 -07:00
Ghom d21e483abf Ports "Disembowelment now only works if you are dead/in critical" (#8671) 2019-06-23 05:59:50 -07:00
Fermi 7c19f5e0fa Forgot to comment out hypnoquirk. 2019-06-23 13:06:45 +01:00