Commit Graph

288 Commits

Author SHA1 Message Date
Aurorablade
f883e06c2e Adjustments 2016-04-09 22:27:53 -04:00
Aurorablade
fab0a1ef17 I HATE EYEBALLS 2016-04-09 00:48:15 -04:00
Tigercat2000
bb5e3bca63 Fix remaining issues and sound shit 2016-04-05 16:26:11 -07:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Fox McCloud
a30b5fbf75 Merge pull request #4076 from Aurorablade/ICUTYOU
Fixes IPC Embbedded object surgery
2016-04-03 01:24:28 -04:00
Aurorablade
e045e10268 remoing pasted line
i need to remove the rest of em later.
2016-04-02 23:42:14 -04:00
Aurorablade
279937c58b Fixes IPC Embbedded object surgery 2016-04-02 23:34:38 -04:00
Tigercat2000
7a41efd1da Last staging fixes 2016-04-01 16:09:43 -07:00
Tigercat2000
519992b5a9 Merge branch 'byond510'
Conflicts:
	.travis.yml
	code/game/jobs/access.dm
	code/game/machinery/camera/camera.dm
	code/game/machinery/flasher.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/laserpointer.dm
	code/game/objects/items/weapons/grenades/flashbang.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/nano/modules/virus2_creator.dm
	code/modules/virus2/disease2.dm
	code/modules/virus2/diseasesplicer.dm
	paradise.dme
2016-04-01 14:15:44 -07:00
Crazylemon64
221cbc82a9 I tested this, and IPCs should go blind upon losing their head
I think the cause of this bug was organs not being removed on decap, which
has since been fixed
2016-03-30 21:16:42 -07:00
Tigercat2000
ec3502af38 Fix the last of fox's noted bugs, runtime prevention 2016-03-30 18:12:03 -07:00
Tigercat2000
ad2cf86898 -tg- disease1
Wee! Readds Disease1, kills off disease2, and finally removes poop.dmi
(fucking piece of shit)

Needs WAY more testing, most of which I don't know how to do yet, because
I've never used this system. Fun!

Changes:
 - Virus2 has been removed completely.
  - Some symptoms have not been readded. Aka, none of them have been
    readded, I just wanted to get this shit ported.
  - Virology has been updated slightly to mirror -tg-'s boxstation, as the
    virus2 machines are gone.
 - Welcome back, disease1
  - The centrifuge, vials, splicer, analyzer, growerthing, have all been
    replaced by the PanD.E.M.I.C. 2220
  - No symptoms have been completely removed; However, vision symptoms
    have been disabled pending byond 510, and genetics symptoms have been
    disabled until "when I figure out how to fix them".
  - Advanced Mutation Toxin now uses a disease, which turns people from
    species, to slime person, to slime. Slime people are instantly turned
    to a slime.
  - Diseased touch now give people appendicitis. Yes, they VANT YOUR...
    appendix.
  - Virology now has a fridge with the following in it:
    - Antiviral Syringes
    - 1 Rhinovirus culture
    - 1 Flu culture
    - 1 Bottle of Mutagen
    - 1 Bottle of Plasma
    - 1 Bottle of Synaptizine
  - A few more things, which I can't remember and can't look at while writing
    this commit. Sometimes, git hurts.

TODO:
 - Test more shit and figure out how the PanD.E.M.I.C. works/is supposed to
   work.
 - Fix genetics symptoms.
 - Give vampires a less shitty diseased touch.
 - Add appendicitis event.
 -
2016-03-27 21:24:00 -07:00
KasparoVy
2825de2173 Allows you to close incisions made within embedded object removal surgery. 2016-03-26 23:35:24 -04:00
TheDZD
2b462793ef Merge pull request #3963 from Fox-McCloud/dental-implants
Ports Dental Implants
2016-03-26 17:38:29 -04:00
TheDZD
cc98621757 Merge pull request #3986 from Fox-McCloud/shadowling-update
Shadowling update
2016-03-26 17:38:19 -04:00
Fox-McCloud
900211db2f pill limit 2016-03-26 01:03:24 -04:00
Fox-McCloud
035b11a1b6 Robotics Sterile Surgery 2016-03-25 14:07:34 -04:00
Fox-McCloud
5194cf773a fixes 2016-03-24 17:50:34 -04:00
Fox-McCloud
f7ad204ff0 mech drills 2016-03-24 00:26:57 -04:00
Fox-McCloud
cf567414c2 Major Shadowling Update 2016-03-23 21:25:15 -04:00
Crazylemon64
cf6a5555f4 Fixes DNA name and mitocholide limb rejuv 2016-03-23 02:31:28 -07:00
Fox-McCloud
6eb2a73c9d Ports Dental Implants 2016-03-22 19:15:49 -04:00
TheDZD
22b97ea005 Merge pull request #3913 from Regen1/robotic-heart-failure
Makes robotic hearts fail when EMP'd and internal organ EMP damage
2016-03-20 19:34:56 -04:00
TheDZD
854420bc74 Merge pull request #3911 from KasparoVy/ipc-fbp-resolved
IPC-FBP Customization
2016-03-20 18:43:51 -04:00
TheDZD
609efbc2db Merge pull request #3933 from Fox-McCloud/fixes-hivenod
Fixes Xeno Hive Node Languages
2016-03-20 12:50:11 -04:00
Fox-McCloud
e0665336e0 Fixes Xeno Hive Node Languages 2016-03-20 03:16:22 -04:00
Crazylemon64
f8d19fa9e9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into mitocholide_organ_rejuv 2016-03-18 20:17:39 -07:00
Crazylemon64
eb04645aea Fixes fox's thing 2016-03-18 20:16:02 -07:00
Fox McCloud
d4b2782f4b Merge pull request #3849 from Aurorablade/BeepBeep
god its late Fixes #3908
2016-03-18 21:40:53 -04:00
Fox McCloud
0d24763e35 Merge pull request #3920 from Crazylemon64/cleaner_dna_application
Makes DNA swapping methods more reliable and other appearance tweaks
2016-03-18 21:37:20 -04:00
Aurorablade
ac5968fb84 I FORGOT THE FEEET! 2016-03-18 21:25:31 -04:00
Regen
9e409dd89c People giving wrong information is fun
External organs will now take burn damage from EMP's again
2016-03-19 02:23:27 +01:00
Aurorablade
b9fd5042f6 look ma, hands.... 2016-03-18 21:13:29 -04:00
Aurorablade
72344f082d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BeepBeep 2016-03-18 20:59:01 -04:00
Aurorablade
ff798ae9ec This is the exact file from the master branch of the Repo 2016-03-18 20:53:28 -04:00
Aurorablade
83d3e392ae Revert "OMG CONFLICT R GRIFFING ME HALP"
This reverts commit fd65c752bf.
2016-03-18 20:40:54 -04:00
Aurorablade
fd65c752bf OMG CONFLICT R GRIFFING ME HALP 2016-03-18 20:32:36 -04:00
Regen
626e1f650b I hope this is the last one 2016-03-19 01:19:19 +01:00
Crazylemon64
d41ab52515 Stop eating my changes 2016-03-18 11:16:21 -07:00
Crazylemon64
3077a397de Adds necrotic organ detection to the advanced med scanner 2016-03-18 11:14:13 -07:00
Aurorablade
bffb90d392 removes somethings... 2016-03-18 14:06:36 -04:00
Regen
8aab1d9438 Fuck sake tiger 2016-03-18 17:57:49 +01:00
Crazylemon64
33f6facdb4 Organs can now be made viable again with an application of mitocholide 2016-03-18 09:14:35 -07:00
Regen
76f77dc514 Tigercat's fix's
Don't blame me if shit's wack anymore
2016-03-18 15:25:31 +01:00
Crazylemon64
d748ef23b8 Makes DNA swapping methods more reliable
- Makes heads keep hair on removal
- Amputated limbs from a DNA-injected individual now will keep their
  appearance of the DNA-injected person
- Wounds will now vanish on their own now
- Admins now have an "incarnate" option on the player panel when viewing
  ghosts for quick player instantiation
- Fixes a runtime regarding failing a limb reconnection surgery
- Copying a client's preferences now overrides the previous mob's DNA
2016-03-17 23:07:45 -07:00
KasparoVy
98285c0518 No longer, I hope. 2016-03-17 20:37:41 -04:00
TheDZD
0ac7c0d4cd Merge pull request #3915 from Crazylemon64/multibrain_fix_v2
Fixes multibrain weirdness... Again.
2016-03-17 17:23:59 -04:00
Crazylemon64
09f10f3e98 Fixes multibrain weirdness 2016-03-17 13:44:21 -07:00
Regen
509683af8c Changes 2016-03-17 21:20:01 +01:00