Commit Graph

1863 Commits

Author SHA1 Message Date
Cheridan 92a40fc470 Merge pull request #8126 from Iamgoofball/raginmages
fixes Ragin' Mages making only 1 mage
2015-03-06 13:04:48 -06:00
Cheridan 6b633c35d2 Merge pull request #8145 from Incoming5643/dangit_bobby_its_all_ones_and_zeros
Hotfix for Blob mulligan rounds not ending | Nuke codes being given in times of peace | AI desiring to blow up the station
2015-03-05 23:33:42 -06:00
Cheridan 07676b352d Merge pull request #8128 from Ikarrus/gangfixup
Makes Gang mode functional again
2015-03-05 21:11:59 -06:00
Cheridan f68fd02d26 Merge pull request #8101 from MrPerson/alert_alert_ur_a_faget
On screen alert system
2015-03-04 19:39:04 -06:00
Cheridan 56b0c321ac Merge branch 'BlobReroll' of git://github.com/RemieRichards/-tg-station into RemieRichards-BlobReroll
Conflicts:
	code/game/gamemodes/blob/overmind.dm
2015-03-04 00:33:44 -06:00
Incoming 83cb66e3a3 Prevents centcom from sending the nuke code to a station that already defeated the blob (because you know they'd still blow themselves up) 2015-03-03 19:49:36 -05:00
Incoming 44d30afd20 Hotfix for Blob mulligan rounds. WHOOOOOPS 2015-03-03 19:42:01 -05:00
Remie Richards d36488e5a2 Merge branch 'master' of https://github.com/tgstation/-tg-station into NecromanticStone
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	icons/obj/wizard.dmi
2015-03-03 20:58:38 +00:00
Ikarrus e7109f984f knockout on conversion 2015-03-03 00:42:11 -07:00
Ikarrus 9b28452bfe Makes Gang mode functional again
I'm going on vacation soon so I thought I might as well bring this game mode back up to at least a minimally functional state before I go.

A lot of features (Gang membership visibility, conversion pens, weapons, deconversion methods) have been stripped out for now. I gave gang bosses uplinks in the meantime.

It's basically rev vs rev right now, but the victory conditions with the recallers are still there. I'll work on adding more stuff after I return from my vacation.
2015-03-02 23:46:46 -07:00
Razharas a07f6e6bfa Merge pull request #8103 from Ikarrus/antag_babbies
Age Restrictions for Antagonists
2015-03-03 09:02:52 +03:00
Iamgoofball 3422390c94 fixes Ragin' Mages making only 1 mage 2015-03-02 21:08:51 -08:00
Incoming ca54747be7 Fixes mulligan'd rounds from never ending because the shuttle was set to strand still
WHOOPS
2015-03-02 18:30:57 -05:00
MrPerson 24dcf08b2e Merge branch 'master' of https://github.com/tgstation/-tg-station into alert_alert_ur_a_faget
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	icons/mob/screen_alien.dmi
2015-03-02 12:04:38 -08:00
Swag McYolosteinen d6a9d8cb8d Merge pull request #8084 from Incoming5643/you_just_got_mulliganed_on
Mulligan Round Fixes/Feature Requests
2015-03-02 10:56:24 +01:00
Incoming 99431757eb Adds a lull between when the antagonist eats it and when the new antagonists are created: 3 ~ 7 minutes (5 average) 2015-03-02 00:24:25 -05:00
Ikarrus f95ca85ed6 Age Restrictions for Antagonists
Default minimum age is 7 days.
Team Antag modes and wizard is 14 days.
Malf minimum is 30 days (Same as AI minimum age).
2015-03-01 20:40:04 -07:00
MrPerson 8ffbc1be14 On screen alert system
Replaces some of the hardcoded HUD icons defined at mob level with a pair of mob procs throw_alert() and clear_alert(). Alerts will appear on the top-right side of the screen.
You can shift-click alerts to get a description of what's wrong and sometimes a tip on how to solve the alert.

Alerts can be given a master, which overlays the master on top of a box and forwards clicks of the alert to that master. Getting buckled will put an alert of what you're buckled to, for example. If it's a chair, you just click the alert and you're unbuckled. The idea I'm shooting for is to replace resist entirely with this kind of stuff.

Making a new alert and using it is a little complicated. This explanation will suck, but this is simpler than I'm making it sound, I promise. Throw_alert() has 4 args, category, id, severity, and obj/new_master. If you don't supply an id, category will be used as id. Only 1 alert per category is allowed; any duplicate will be replaced. Additionally clear_alert() clears alerts by category. Id MUST match a type path of /obj/screen/alert/[id]. That type path is where the alert's name and desc come from. The icon_state of the alert will either be "template" if new_master is set or [id][severity] otherwise. new_master is totally optional.

Examples:
throw_alert("oxy") -- takes name/desc of obj/screen/alert/oxy, icon_state = "oxy" -- clear_alert("oxy")
throw_alert("nutrition","fat") -- takes name/desc of obj/screen/alert/fat, icon_state = "fat" -- clear_alert("nutrition")
throw_alert("nutrition","starving") -- takes name/desc of obj/screen/alert/starving, icon_state = "starving" -- clear_alert("nutrition")
throw_alert("temp","cold",1) -- takes name/desc of obj/screen/alert/cold, icon_state = "cold1" -- clear_alert("temp")
throw_alert("temp","cold",3) -- takes name/desc of obj/screen/alert/cold, icon_state = "cold3" -- clear_alert("temp")

If you pass a new_master, id is only used to get name/desc and still must match a path, but the icon_state is "template" and icon is from the mob's ui preference instead of icons/mob/screen_alert.dmi.

Several unused icons removed, like borg oxygen and temperature alerts. Also some icons were used but now are not and were removed, like the nutrition icon for being well-fed and cyborg charge icon for being fully charged.
2015-03-01 17:31:26 -08:00
Remie Richards 14d5b559c7 Merge pull request #8072 from MrStonedOne/isee-saidtheblindman
Fixes #772 Toggling darkness off prevents ghosts from seeing one another
2015-03-01 22:01:35 +00:00
Incoming5643 2ff6e8ff08 Always remember to port smartly 2015-03-01 16:09:51 -05:00
Incoming 79edc1ff88 Replaces the custom "how many people are dead?" check with the one used for survival rates on round end statitistics because, lets be honest here, we know that one works.
Shuffles some flags around that should hopefully prevent round_converted() from running more than once. It's not a huge crisis if it does because late join antag is self capping, but still, not intended behavoir!
2015-03-01 12:13:55 -05:00
MrStonedOne 64851a016f Adds blob overmind cursor mob to ghost darkness vision
Thanks @Ricotez

Also tweaks the wording of related verbs, procs, and variables to match

Moves the scope of the ghostimages (now ghost darkness images) var and updatedateallghostimages proc to the global space so other things can access them
2015-03-01 04:07:10 -08:00
Incoming 3404074a32 adds an admin message on round conversion provided it gets far enough to matter. It also reports the same if no antags are made, to stop the exotic threat of unintentional admin meta. 2015-03-01 00:18:17 -05:00
Remie Richards 736ffafa55 Merge branch 'master' of https://github.com/tgstation/-tg-station into BlobReroll
Conflicts:
	code/game/gamemodes/blob/blobs/blob_mobs.dm
	code/game/gamemodes/blob/blobs/core.dm
2015-03-01 00:18:19 +00:00
Remie Richards 679c63a8ea Merge pull request #7924 from Incoming5643/mulligan_rounds
Mulligan Rounds for Wizard/Blob/Malf
2015-02-28 21:27:18 +00:00
Cheridan f4c5332817 Merge pull request #7932 from phil235/NarsieSacCheck
Prevents cultist from summoning Nar-Sie when their sacrifice objective isn't complete.
2015-02-26 02:21:08 -06:00
hornygranny f7342415c1 Merge pull request #7959 from phil235/AttackSelfTKFix
A bunch of fixes
2015-02-25 19:54:36 -08:00
Steelpoint da53175ad5 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
Conflicts:
	icons/mob/inhands/guns_lefthand.dmi
	icons/mob/inhands/guns_righthand.dmi
	icons/obj/guns/energy.dmi
2015-02-25 11:44:27 +08:00
Incoming 081df302f5 Makes the "are too many people dead for this to be fun?" check more indicative of people who are actually playing
Adds a new toggle: Midround_antagonist that allows players to opt out of gaining antagonist through this system if they'd prefer. It defaults to on but is newbie safe because without any antagonist flags (which default to off), it won't place players into antagonist slots.
2015-02-24 18:17:07 -05:00
Remie Richards b1ff6b7220 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
Conflicts:
	code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +00:00
phil235 1a70e57551 Merge pull request #7939 from GunHog/Of_Malf_And_Turrets
Fixes Turret Upgrade Malfunction Power
2015-02-24 20:34:07 +01:00
phil235 79de9615dc Fixes not being able to prime grenade, toggle lamps and other attack_self things with TK.
Fixes the blobbernaut death animation looping.
Fixes armchair layer being above ghost layer.
Fixes chloral hydrate metabolization rate (and 2 other reagents)
Fixes a typo in closet/attack_self() .
2015-02-24 16:36:40 +01:00
GunHog d157113cdc Fixes Turret Upgrade Malfunction Power
- Repaths the Turret Upgrade power to work on portable turrets.
- Corrects the shot_delay value to actually be a buff instead of a nerf.
2015-02-23 11:47:04 -06:00
phil235 3c6715d5db Prevents cultist from summoning Nar-Sie when their sacrifice objective isn't complete. 2015-02-23 13:11:39 +01:00
hornygranny a5a7b590d3 Merge pull request #7866 from phil235/PullBuckleFix
Fixes being able to break free from a pull while handcuffed if the puller is buckled.
2015-02-22 20:18:54 -08:00
hornygranny d2b7afa083 Merge pull request #7871 from phil235/NarsieSpamFix
Fixes narsie message spam from multiple nar-sie spawn.
2015-02-22 20:18:09 -08:00
Incoming 24cc205ce5 On primary antagonist rounds (wizard/blob/malfunction) if the config is set for continous rounds the round will convert on the fly to a new mode choosen from these mode if the primary antagonist dies:
EXTENDED
TRAITOR
CHANGELING
DOUBLE AGENTS
TRAITORLING

based on the game probabilities set through the config.

The round will not convert if more than 30% of the players are dead (round immediatly ends) or if the shuttle is beyond the point of no return (the round ends normally).

Adds the CONTINIOUS_ROUND_BLOB config
2015-02-22 21:32:17 -05:00
Swag McYolosteinen 69d4ec3e5f Merge pull request #7615 from Xhuis/burnfilthypigs
Adds malicious modes to air and fire alarms
2015-02-22 12:03:53 +01:00
phil235 8f493d64c8 Fixes narsie message spam from multiple nar-sie spawn. 2015-02-21 16:41:17 +01:00
phil235 e9a943218c Fixes being able to break free from a pull while handcuffed if the puller is buckled.
Add the incapacitated proc to mobs to check for stat, stun, weakened, paralysis, restrained. And replacing those checks by that new proc in some places.
2015-02-21 14:49:47 +01:00
Razharas a761fd2306 Merge pull request #7826 from TheVekter/fuckthestation
Adds the new Self-Destruct Mechanism to the vault
2015-02-20 08:56:31 +03:00
hornygranny 383e4e7111 Merge pull request #7792 from Menshin/regen_statis_tweaks
Regenerative statis tweaks
2015-02-19 13:07:24 -08:00
Razharas 5365dd1438 Merge pull request #7799 from paprka/magshit
removes bloat from magazines icons
2015-02-19 21:01:46 +03:00
Remie Richards 5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
hornygranny dbee9709d1 Merge pull request #7790 from phil235/CryoStingExploitFix
Fixes cryosting detection exploit
2015-02-18 21:48:45 -08:00
TheVekter d66455bcd9 Adds the new Nuke to the Vault.
* Adds some new floor designs as well, which will be implemented for future fuckery
2015-02-18 23:03:51 -06:00
Steelpoint 8b53405b17 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
Conflicts:
	icons/mob/inhands/guns_lefthand.dmi
	icons/mob/inhands/guns_righthand.dmi
	icons/obj/guns/energy.dmi
2015-02-18 12:50:05 +08:00
paprka 15e2b88a0f removes bloat from magazines icons 2015-02-17 19:43:20 -08:00
Menshin 89df7f351d * Getting into regenerative statis now put the changeling into unconscious state
* Fixed reviving not working
2015-02-17 22:04:58 +01:00
phil235 6e938b5cd7 Fixes cryosting exploit by removing ice reagent from cryosting, removing the beer+frostoil= icedbeer (ice+beer=iced beer already exists), and buffing frostoil effect to compensate. 2015-02-17 19:54:14 +01:00