Commit Graph

242 Commits

Author SHA1 Message Date
Remie Richards 2138e1d2c7 Merge pull request #5884 from tkdrg/ionblastUSA
Moves the ion law picklists to an external txt
2014-11-17 09:48:04 +00:00
Cheridan 24456bcc22 Merge branch 'PipenetRevamp' of https://github.com/Aranclanos/-tg-station into Aranclanos-PipenetRevamp
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/portables_connector.dm
2014-11-13 18:55:53 -06:00
Cheridan 38eeca2ebd Merge pull request #5644 from Jordie0608/beekeepermodewhen
Adds bee swarms and butterflies and diseases to create them
2014-11-13 17:04:29 -06:00
tkdrg 47efa898df Ion strings moved to external txt. Credits to volundr @ goonstation for the idea and the contents of _string_lists.dm 2014-11-13 19:59:20 -03:00
hornygranny e392609b6f Merge pull request #5425 from Menshin/meteor_redux
Meteors redux
2014-11-08 15:24:44 -08:00
Menshin c724b54892 * Fixes meteors infinigibs and infinisplosions (#5226)
* Made meteors more threatening
* Added an ultra rare station buster Tunguska meteor
* Made admin-spawned meteor not instantly delete
* Added several types of meteor waves : normal, threatening, catastrophic which are randomly choose at wave start
* Meaty ores now spawn blood on tiles instead of busting them
* Differentiates regulars and reinforced girders ex_act
* Changelog included
2014-11-08 14:43:48 +01:00
Jordie0608 590684e129 Merge branch 'master' of https://github.com/tgstation/-tg-station into beekeepermodewhen
Conflicts:
	icons/mob/animal.dmi
	tgstation.dme
2014-11-09 00:15:12 +11:00
Remie Richards 2054cbda08 Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human_attackpaw.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
2014-11-08 01:07:29 +00:00
phil235 bc5754b378 adding diagonal attack animation. 2014-11-07 15:42:07 +01:00
phil235 1506383b2c Adding some missing do_attack_animation()
Moving do_attack_animation() proc to mob/living
Fixing the pixel offset issue from beds especially rollerbed.
Fixing the nograv bouncing stopping because of another animation being used.(lying down, jittering, attack animation)
2014-11-03 15:11:39 +01:00
Aranclanos 5a237e6854 Merge branch 'master' of https://github.com/tgstation/-tg-station into PipenetRevamp 2014-11-03 08:34:47 -03:00
Aranclanos 8aa5a137c5 Pipenet revamp
-Removed the pipenet network datum, now it will all be done with the pipeline datum
-All atmos pipes and machines will always have a pipeline datum
-Moved the valves to the binary subtype and the portable connectors to the unary subtype
-The pipe vents (who were barely used in three spots of the map) are removed, the map slots will replaced with outlets
-Fixes some bugs of pipenet disconnection, mostly on explosions
-Cleaned a bit the copypaste of construction.dm of pipes
-Removed the ID restrictions of digital valves and the frequency (both unused)
2014-11-03 08:21:31 -03:00
phil235 3f30912c51 WIP - Adding attack animation to most attacks.
Fixing a couple "for(......) show_message()".
2014-11-02 22:50:58 +01:00
Menshin 5037e880d8 Fix the lag produces by oversized Pumpkings bounds interacting with space transitions.
Reduced the number of meteors to 10 waves of 3 over 40 seconds.
2014-10-31 19:48:55 +01:00
Miauw 0cadefd855 Nothing to see here, continue with your planned spooking, citizens. 2014-10-31 21:52:10 +01:00
tkdrg 0bb462e857 Fixes botcall conflicts, removes even more cruft and unused code 2014-10-30 20:36:30 -03:00
Remie Richards fa184f5487 Cuts /disease variables from 28 to 23 (includes new ones)
a disease may now have more than one spread type
added "infectivity" variable which replaces a prob(65), defaults to 65
affected_species is now viable_mobtypes, and lists typepaths, this is due to us actually having a species system now so it's confusing
adds defines for a bunch of stuff
2014-10-30 06:21:14 +00:00
Miauw62 9a378933d2 Makes spookoween compile 2014-10-25 11:40:53 +00:00
Miauw62 a0d3a09ef8 Merge branch 'master' of https://github.com/tgstation/-tg-station into thespookisreal
Conflicts:
	code/modules/events/carp_migration.dm
2014-10-25 11:29:07 +00:00
phil235 a4d707f00f Also fixing the end() proc for pyroplastic anomaly. 2014-10-22 21:00:38 +02:00
phil235 e73abf676f Merge branch 'master' of https://github.com/tgstation/-tg-station into AnomalyFix 2014-10-22 20:54:35 +02:00
phil235 2a0eeea1fb Fixes two anomaly bugs. One: bluespace anomaly doing translocation despite being destroyed. Two: anomaly not checking for the signal code. 2014-10-22 17:39:09 +02:00
hornygranny 9e2dc67e86 Merge pull request #5363 from Cheridan/better_noms
Anomaly Event Changes
2014-10-20 19:24:04 -07:00
Cheridan 455b526cc1 Merge pull request #5318 from phil235/MsgFix2
More messages fixed
2014-10-19 21:39:06 -05:00
Cheridan f52d3e8c69 Anomaly Event Changes
Increases the duration and occurrence rate of Anomaly events.
Anomaly cores now give better research values.
Bluespace anomalies no longer teleport anchored objects because it looks godawful.

If not defused, Pyroclastic Anomalies will create a red or orange slime.
2014-10-19 17:07:07 -05:00
phil235 9b9481d65c Changes many span classes.
Replaces for(mob in oviewers) show_message()  with visible_message() when possible.

Fixes the absolute pathing in Ninja code.

Fixes facehugger attack messages being bold red for third party (only the first leap message will stay bold red for third party, for better visibility)

Standardizes vomiting message

Fixes mech occupant not receiving any attack messages when the mech is attacked.
2014-10-18 16:00:38 +02:00
paprka 8312c52286 Merge branch 'master' of https://github.com/tgstation/-tg-station into removegreyshirt
Conflicts:
	icons/mob/uniform.dmi
2014-10-16 21:29:10 -07:00
Cheridan ec579469a7 Merge pull request #5269 from AnturK/fixuno
Fix for #5247
2014-10-16 08:36:12 -05:00
Remie Richards cd9e62a7c2 Merge pull request #5220 from Menshin/false_alarm_runtimes_fix
Fixes false alarm event runtime
2014-10-15 11:57:21 +01:00
AnturK d28e56e5af Fix for #5247 2014-10-15 11:35:53 +02:00
paprka 20d6524945 cleaned up code and added orange jumpsuits 2014-10-13 15:36:50 -07:00
Menshin 0c32d85b85 Fixes false alarm event runtime caused by an uninitialized list 2014-10-12 21:04:21 +02:00
MrPerson ceb045f86b Merge pull request #5174 from Jordie0608/properwordingisrealfun
Renames Fake Explosion to Fake Nuclear Explosion
2014-10-11 12:41:00 -07:00
Swag McYolosteinen cd60db5e18 Merge pull request #5124 from MrPerson/implant_action_button
Give implants an action button
2014-10-11 18:15:44 +02:00
Swag McYolosteinen 6a3b075036 Makes trick-o-treat bags appear on spookoween.
by sawu, again.
2014-10-11 13:40:19 +02:00
Jordie0608 9dfd0489d1 Renames Fake Explosion to Fake Nuclear Explosion 2014-10-11 03:06:28 +11:00
Remie Richards e60dda5f0e Merge pull request #5106 from paprka/megacarps
Ports megacarps!!!
2014-10-08 22:16:22 +01:00
MrPerson 1995ac638b Allow activating implants even when stunned and such
Make ninja implants show up right
Add a changelog for the action_button stuff
2014-10-07 01:04:10 -07:00
Remie Richards 980a0e5b81 Makes eyeball migration a real event 2014-10-06 17:50:06 +01:00
paprka f406371704 ports megacarps!!! 2014-10-05 16:19:19 -07:00
Remie Richards 54a3e92145 Eyeball migration 2014-10-05 13:58:08 +01:00
Remie Richards 4fd3b7c80b Pumpkin meteors 2014-10-05 13:10:31 +01:00
Cheridan 08be1b34eb Revert "Changes a few green crosses to blue on sprites that I missed last time" 2014-10-04 19:22:10 -05:00
Miauw 3048b553e9 Adds super spooky zombies to spice up spookoween. 2014-10-04 15:54:39 +02:00
MrPerson 651c3e6db5 Merge to master - sole conflicting file was ninja.dm FUCK NINJAS 2014-10-04 01:45:39 -07:00
Remie Richards b0827a189d Merge pull request #5025 from Incoming5643/summoneventfixerspecialer
Hopefully the final pass of initial tweaks and fixes for summon events
2014-10-03 14:34:56 +01:00
Incoming 6aacfbcaaf *Admins will be notified when Summon Events is put into play (Fixes #5057)
*Adds a badmin summon events button the secret menu, it's a toggle so you can turn it off at will as well.
2014-10-02 13:23:32 -04:00
Cheridan 8247ccb866 Merge pull request #4977 from Menshin/structure_lighting_update
Makes opaque structures and space vines update surrounding lights when destroyed
2014-10-01 10:27:40 -05:00
Incoming 13643b6607 Normal, Magic, and Holiday events will be seperated out on the trigger event menu
Fixes #5033

The invincibilty event won't cure benificial viruses
Fixes #5034
2014-09-30 14:08:01 -04:00
Incoming a1b2f8f00f Hopefully the final pass of initial tweaks and fixes for summon events
*Reworks teleporation so change places doesn't leave people distantly locked to chairs
*Adds a sanity check for improved spellcasting for some badmin abuse
*Delays zombie outbreak from occuring until 20 minutes into the round because it was often occuring before there was ample dead
*Removes the earmuffs from the cursed items loadout for being neither fun nor useful to anyone
*Removes the fake explosion from summon events for losing its appeal once it was expected, it still exists as a badmin event though.
*Reels in the 4th wall shattering nature of the greentext a bit
*Adds a message to affected people for Change Races, since some people are so decked out in gear they wouldn't even notice anything had happened
*Fixes change names to actually work
*Rewrites change minds to avoid edge cases where some people could be swapped twice back into their original body
2014-09-29 19:05:23 -04:00