Commit Graph

186 Commits

Author SHA1 Message Date
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
JJRcop
6bc47e8369 Magicarp now fires a random projectile each time, instead of the same one randomized on New()
Magicarp now randomizes from typesof(initial(projectiletype)) instead of from typesof(/obj/item/projectile/magic) to allow future carps that inherit it to fire whatever they want without changing the code
2014-09-09 19:07:44 -04:00
Iamgoofball
48d3f17ecf グレー marée estación ar fud an google translate
multilingual grey tides
2014-09-08 18:49:45 -07:00
Iamgoofball
8120a6eb23 Update departmentrevolt.dm 2014-09-07 21:28:10 -07:00
Iamgoofball
4b311777a4 estación de marea gris de ancho 2014-09-07 21:21:39 -07:00
Iamgoofball
552f751c2d CRITICAL BUGFIX for Magic Mania $1.75
>department revolt event
>no potential for the rng to roll "cargonia"

important bugfix merge asap
2014-09-07 20:59:09 -07:00
Orange Borg
0e05203e1a Don't tell GIA
2fast goofball
2014-09-08 15:55:04 +12:00
Cheridan
cd34be6151 Merge pull request #4521 from Incoming5643/summonevents
Magic Mania $1.75: Summon events
2014-09-07 22:34:26 -05:00
Aranclanos
4ee758c0d8 Removes ninja mask modes (thermal, nightvision, traitor-scan and mason) and gives ninjas night vision glasses. 2014-09-02 21:28:17 -03:00
Cheridan
f209d4ba52 Merge pull request #4601 from Ikarrus/removeholidaycheer
Holiday Events no longer fire false alarms
2014-08-30 16:41:23 -05:00
Alex
679e0bda52 Merge pull request #4524 from Ikarrus/eventsprompter
Trigger Events verb will now ask if the admin wants to announce to the crew
2014-08-30 20:12:46 +01:00
ikarrus
a49f4e77ae Holiday events will stop failing False Alarm events. 2014-08-29 09:15:23 -06:00
ikarrus
291f0f5716 Holiday Events no longer fire false alarms
Fixes #4597
Also fixes wierd identation
2014-08-28 23:05:14 -06:00
ikarrus
a8732d4219 One more holiday event to label 2014-08-28 22:58:57 -06:00
ikarrus
1cfdde31f3 -Trigger Event is now its own panel
-The prompt to alert the crew now includes a cancel button
-Holiday Events are now marked more clearly in the menu
2014-08-28 22:08:14 -06:00
Incoming
d3d351dea8 Red Carp! 2014-08-28 14:37:42 -04:00
Incoming
ea4350a0a1 Adds the magicarp event as a rare happening. 2014-08-28 12:10:48 -04:00
Incoming
b47df3a9cf Flexes spellllang n bartflags 2014-08-26 17:43:39 -04:00
Firecage
6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
Incoming
4639bcec55 Imposter and department revolt are now bugtested and fully functional.
We feature complete save for the nitpicks!
2014-08-23 16:31:29 -04:00
Firecage
dac8669166 Span classes for files in the following module folders: assembly, client, detectivework, events, hydroponics, mining, paperwork 2014-08-23 10:13:21 +02:00
Incoming
e10b108c0d z.restricts cursed item loadouts that would ruin the day of anyone in deep space
Moves the robeless casting from uncommon to rare
2014-08-22 14:25:49 -04:00
Incoming
70d29f25ff whoops missed balancing an event 2014-08-22 10:07:04 -04:00
ikarrus
9843dbc37d Trigger Events verb will now ask if the admin wants to announce to the crew
Additionally,
-Create virus re-added to secrets menu, as it had options to specify a specific virus to create
-Blob added to One-Click-Antag with the option to set the strength of the blob (1=Weak, 2= Strong, 3=Full)
2014-08-21 21:33:53 -06:00
Incoming
7ac7ecb277 Summon Events Initial Commit: See the pull for complete details 2014-08-21 20:05:41 -04:00
Cheridan
74a4c95bc5 Merge pull request #4488 from Ikarrus/remove-ninja-instagib
Phase Shift will no longer instagib
2014-08-21 15:17:25 -05:00
ikarrus
507ae815b5 180 -> 190 2014-08-19 09:04:42 -06:00
ikarrus
8b4e591489 Ninja Phase Shift will no longer instagib
-Phase Shift now hurts and knocks the person instead of gg no re instagib they never saw coming
-Phase Slayer deals 180 damage (360 damage to mechas) instead of gibbing them.
-Ninja Random Event now has a spawn delay of one hour
2014-08-18 19:34:50 -06:00
ikarrus
170c0e1b6b Removed Events from Admin Secrets menu. Trigger Event verb moved to Fun tab.
-No more need to maintain a list of events to trigger
-No more needing to use debug-verbs to trigger all events
2014-08-15 20:24:49 -06:00
Aranclanos
ccae5781c5 added two defines CLICK_CD_RANGE and CLICK_CD_MELEE (4 and 8), replaced all changeNext_move() procs to use these two defines.
Added melee click cooldown for paper spam on cameras.
2014-08-03 22:14:56 -03:00
Alex
6da164fa57 Merge pull request #4194 from A-t48/AdminMeteorConfirm
Fix #3738 Admin spawned meteors has no announcement confirmation
2014-07-25 09:24:46 +01:00
Cheridan
1e7a737a06 Merge pull request #4145 from Ergovisavi/faction_check
Changes faction to list
2014-07-22 19:10:53 -05:00
Kyle Franz
fc5a6f9915 Fix #3738 Admin spawned meteors has no announcement confirmation 2014-07-19 00:20:19 -07:00
Ergovisavi
ff17e36750 Changes faction to list and edits hostile mobs to use the list type faction, along with changing existing factions to match the new list type
Also changes trees and space bats to "hostile" faction because they were copypasta'd carp before that, as well as changing goats to "neutral" and attack_self 1 so that the great mining drone / goat wars end
2014-07-12 20:03:46 -07:00
Aranclanos
33ee96dc39 Fixed the crash with immovable rods 2014-07-12 20:44:48 -03:00
Cheridan
b02b93ce2a Notifications + Random Stuff
Adds sound notifications for Ninja and Wizard Apprentice spawning -- hopefully means fewer afk antags.

Adds a ghostnotice span class, used in the new notify_ghosts proc. Upon creation, things that require ghostly attention (NarSie, golem runes) give more visible messages to the dead.

Retires the 'moderate' span class, which was only used in tomato throwing? Refactors tomato code (this ended up being the meat of this PR, somehow...)

Reorganizes some item definition/procs.
2014-07-01 23:16:02 -05:00