Commit Graph

11347 Commits

Author SHA1 Message Date
Swag McYolosteinen fc9fbbd19c Actually adds the spooky halloween content by sawu.
Somehow it didnt make it in properly vOv
2014-10-11 13:36:51 +02:00
Swag McYolosteinen 99ff426664 Merge pull request #4 from RemieRichards/2spooky3
Eyeball migration
2014-10-08 15:37:27 +02:00
Remie Richards 980a0e5b81 Makes eyeball migration a real event 2014-10-06 17:50:06 +01:00
Miauw ae23274acf Adds spooky halloween content by sawu.
- spooky skull and coffin cookies
- trick-o-treat bags
2014-10-06 18:32:32 +02: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
Remie Richards 902974022e Merge branch 'thespookisreal' of https://github.com/Miauw62/-tg-station into 2spooky 2014-10-04 15:29:40 +01:00
Miauw 85adc6379f fixes zombie meat being more spooky than intended. 2014-10-04 16:09:48 +02:00
Miauw 3048b553e9 Adds super spooky zombies to spice up spookoween. 2014-10-04 15:54:39 +02:00
Swag McYolosteinen d0a9e31c3c Merge pull request #5045 from Steelpoint/master
[MAP] Minor Map Changes
2014-10-04 13:37:18 +02:00
Remie Richards cd53199398 Merge pull request #5004 from Menshin/malf_timer_fixes
Malf timer polishing/fixes
2014-10-03 21:41:15 +01:00
Remie Richards 3c8ea2432d Merge pull request #5041 from paprka/syndieboots
Syndicate magboots
2014-10-03 14:38:34 +01: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
paprka e02772f387 Raised cost for recent pricing update 2014-10-03 00:45:04 -07:00
Cheridan 3515e6767d Merge pull request #4940 from JJRcop/sdql2-multiquery
Adds multi-query support in SDQL2
2014-10-02 22:09:04 -05:00
Cheridan 9b7856e048 Merge pull request #5005 from Miauw62/wjfondlesxenos
Makes xe- ALIENS hiss again when speaking.
2014-10-02 22:01:18 -05:00
Cheridan c2f6469a04 Merge pull request #4953 from Aranclanos/mastercontroller
Stops the master controller New() from reloading away missions.
2014-10-02 14:36:50 -05: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
Remie Richards 6fd1cc639b Merge pull request #5016 from Ikarrus/savethespecies
Fixes Character Saves not remembering Species
2014-10-02 16:50:29 +01:00
Cheridan fa772be323 Merge pull request #5009 from Ikarrus/agentcardname
Names Nuke Op Leader's ID card
2014-10-02 10:27:46 -05:00
paprka 372ecd6233 Merge branch 'master' of https://github.com/tgstation/-tg-station into syndicateshotgunsreturn
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2014-10-01 20:10:58 -07:00
Cheridan 255254cb69 Merge pull request #5038 from paprka/atmosbelt
Utility/medical belts can now hold pocket extinguishers
2014-10-01 21:24:58 -05:00
Aranclanos a8056c6ba7 Merge pull request #4995 from Cheridan/hidey
Smuggler Satchels
2014-10-01 22:49:41 -03:00
Cheridan eae5d0b7af Smuggler pack can now fit in backpacks itself
Fixes some sprite issues
2014-10-01 17:33:08 -05:00
paprka 3fca874ea3 even more code optimizing 2014-10-01 15:12:21 -07:00
Steelpoint 89141cb906 AREAS!AREAS! 2014-10-02 02:06:09 +08:00
Cheridan 088a2a2106 Merge pull request #5008 from Miauw62/EVERYTHINGBKEARPESK
Simple animal emotes work again.
2014-10-01 10:45:53 -05:00
Steelpoint 5e38db954d Area 2014-10-01 23:37:02 +08: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
Cheridan 6e44354f9d Merge pull request #4914 from RemieRichards/DroneImprove
Drone Improvements - Take 2 PR Boogaloo
2014-10-01 10:16:06 -05:00
Cheridan eebc00e0ae Merge pull request #5014 from Ikarrus/redalerttime
Calling the shuttle during Red Alert will now announce the correct time
2014-10-01 09:56:19 -05:00
Steelpoint 48dd6acd15 TheEnd 2014-10-01 14:41:59 +08:00
paprka ca9ab8ebd7 updated coding 2014-09-30 16:34:16 -07:00
paprka fe6e9dfd80 some overlooked text things 2014-09-30 15:17:01 -07:00
paprka c9db4d85d5 syndicate magboots and sprite fix 2014-09-30 15:11:30 -07:00
paprka 6db18cff96 initial commit 2014-09-30 13:41:02 -07:00
paprka 93d160ed68 compile fix 2014-09-30 13:14:44 -07:00
paprka b775da4e60 extinguish fires 2014-09-30 12:38:59 -07: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
Cheridan 94c72605e2 Merge pull request #4990 from Ikarrus/deathsquads
Make Deathsquad button can be used more than once
2014-09-30 12:55:50 -05:00
Cheridan fa751f2f72 Merge pull request #4975 from phil235/CloneMessages
Replacing clone damage descriptions with "cellular damage".
2014-09-30 12:21:42 -05:00
Cheridan 3b2291189b Merge pull request #4991 from Ikarrus/ferryjmp
Adds a JMP link to the Admin Ferry Message
2014-09-30 12:16:47 -05:00
Swag McYolosteinen 9943cc3ec7 Merge pull request #4927 from Donkie/ntsl
NTSL: Cleanup, Added some functions [MERGEREADY]
2014-09-30 18:46:09 +02:00
Daniel 021e960bb3 Removed language argument from broadcast() 2014-09-30 18:20:01 +02:00
Cheridan eaecd4eb63 Merge pull request #5027 from Menshin/spacecube_hotfix
[hotfix] Fixes the spacecube runtime at server start
2014-09-30 06:25:17 -05:00
Remie Richards 219864312a Merge pull request #4988 from Miauw62/420
Fixes a bunch of saycode things.
2014-09-30 10:23:23 +01:00
Remie Richards 87c2eeb24a Merge pull request #4983 from paprka/armorbutton
Reactive Teleport Armor action button
2014-09-30 10:22:38 +01:00
JJRcop b73f1da01e Moves SDQL2 query verb into Debug tab by default, instead of being under debug-verbs 2014-09-29 22:37:55 -04:00
Menshin be88cf80c1 Fixes the spacecube server start runtime (index out of bound for array) by making the z_level list an associative list. 2014-09-30 01:15:55 +02: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