Commit Graph

226 Commits

Author SHA1 Message Date
tkdrg
0bb462e857 Fixes botcall conflicts, removes even more cruft and unused code 2014-10-30 20:36:30 -03: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
Menshin
879a51c2f7 *Makes opaque spacevine update lighting when destroyed
*convert some proc to full path
2014-09-26 19:27:05 +02:00
phil235
3248e23887 Merge branch 'master' of https://github.com/tgstation/-tg-station into AudibleMsgFix
Conflicts:
	code/modules/recycling/disposal.dm
2014-09-25 18:45:53 +02:00
Cheridan
e42bcbcbf8 Merge pull request #4803 from Incoming5643/summonbadmins
Allows wizard events to be forced outside of summon events
2014-09-23 09:23:32 -05:00
Jordie0608
facb2744cb Standardizes name and path of plastique/plastic explosive/c4 to C4 2014-09-21 17:34:26 +10:00
Cheridan
de6edfc1c6 Merge pull request #4818 from Incoming5643/summoneventfixerspecial
Magic Mania 1.75 Appendix A: lets get comparitively reasonable
2014-09-16 09:09:40 -05:00
Alex
6a083ecda0 Merge pull request #4835 from Aranclanos/Entered
Entered() cleanup
2014-09-16 12:12:04 +01:00
Incoming
071f9bff0a Fixes up some silly problems with cursed items:
Things won't be called cursed cursed cursed cursed cursed cursed cursed cursed cursed cursed cursed cursed foo's anymore

Cursed Katanas can't get stuck in any other slots now

Things that destroy your ability to go into space now won't spawn on you at all if you happen to be in space when the spawning occurers, but hey don't idle in space just to avoid a luchador mask, magicarp are still a thing.
2014-09-15 19:22:25 -04:00
Cheridan
6587b56a7c Merge pull request #4765 from JJRcop/magicarp-random
Creates new "chaos magicarp" that fires a random projectile each time
2014-09-15 10:22:50 -05:00
Aranclanos
53f48fa599 Cleaned up the turf Entered() procs:
-Removed check for infrared beams. (it checked each time that anything moved)
-Removed 'movement_disabled' check, the verb is also completely removed.

For space Entered() turfs:
-Removed check for meteor
Now meteors and immovable rods will use the same proc to determinate their start and finish, while moving they'll check in which z level they are, deleting themselves if they leave it.
-Removed spawn() to move objects being pulled between z levels
Replaced the step() from mob pulling movement code and replaced them with Move()

For asteroid Entered turfs:
-Removed check for mining cyborgs, now it will be next to the janitor borg check to clean the floor.

Mecha code got a small clean, removing the Entered() calls from there.
2014-09-15 03:26:58 -03:00
JJRcop
97a65cfb04 Changes Shoot() in magicarp to be forwards compatible 2014-09-14 16:07:54 -04:00
Incoming
a8737f8ae4 Stops the exponential hell of petsplosion happening more than once a round it turns out we didn't need 6000 mice
Reduces the lava event from "lets slay all idlers and stop all action for 2 minutes" to "lets greviously wound all idlers and stop all action for 30 seconds"

Makes summon magic/summon guns work fine without a mob attached, this prevents a runtime and some odd messages to the admins

Makes the inviciblity text jive better.
2014-09-14 03:36:38 -04:00
phil235
87d7c9e91e Create the audible_message() proc to replace most instance of " for(var/mob/M in hearers(...) show_message(..., 2)"
fixing typos and missing emotes in emote lists.
2014-09-14 01:15:15 +02:00
Iamgoofball
af7be3cfdc Update departmentrevolt.dm 2014-09-12 16:41:37 -07:00
Incoming
df53111db9 Allows wizard events to be forced outside of summon events (and normal events to be forced within summon events) 2014-09-12 19:00:02 -04:00
Iamgoofball
a15fc94460 Update departmentrevolt.dm 2014-09-12 15:56:45 -07:00
JJRcop
7b0306f7b1 Moved magicarp ammo reroll to new carp called "chaos magicarp", which has 75 health and a 5% chance to spawn instead of a normal magicarp 2014-09-10 14:20:03 -04:00