Commit Graph

2267 Commits

Author SHA1 Message Date
Xhuis 6ef09bdbd8 Adds text for all antagonists 2015-06-30 01:15:28 -04:00
Xhuis cb2043af82 Removes line of unused code 2015-06-29 23:47:18 -04:00
Xhuis 2cd02c5431 Antagonist popups 2015-06-29 23:44:21 -04:00
phil235 7ce138afef Merge pull request #9314 from AnturK/blob_examine
Adds blob toxin to blob description
2015-06-29 19:28:10 +02:00
AnturK 0bfe2a191b removes leftovers 2015-06-29 19:02:51 +02:00
Ikarrus 9b09a5115b Increased recruitment cooldown to 3 minutes with bonus reductions at 30 seconds per head. 2015-06-29 08:46:11 -06:00
Ikarrus 0ef4c29a89 Recruitment proc checks for the implant first before gang affiliation. 2015-06-28 22:01:01 -06:00
Ikarrus a5c4d4134d New Gene tag by Joan +fixes 2015-06-28 20:11:29 -06:00
Ikarrus fbafd72660 Pistol Ammo was lost in the conflict resolution 2015-06-28 08:32:33 -06:00
Ikarrus c08cfb8018 Merge branch 'master' of https://github.com/tgstation/-tg-station into gangnerf
Conflicts:
	code/game/gamemodes/gang/recaller.dm
2015-06-28 08:30:00 -06:00
Razharas acca364c50 Merge pull request #10191 from Xhuis/thoseDogsAreSleepingByTheWay
Gang Fighting Styles
2015-06-28 17:22:38 +03:00
AnturK ef9712be12 Polling instead of persistent. 2015-06-28 15:23:43 +02:00
phil235 e8d3deafab Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
Conflicts:
	code/modules/clothing/masks/gasmask.dm
2015-06-28 15:22:21 +02:00
AnturK cad9b44264 Removes redundancy 2015-06-28 14:34:48 +02:00
AnturK 20576bb71f Adds blob toxin to examine 2015-06-28 14:34:48 +02:00
Xhuis 352500d341 Sprites bo staff, adds custom martial art 2015-06-27 15:32:54 -04:00
Ikarrus 436099550b Additional Tweaks 2015-06-27 09:55:45 -06:00
Ikarrus 18098752ac Gang Tweaks
- Gang Lieutenants can buy gang tools now, but at a higher cost than the original boss
- Gang leaders can register additional gangtools to themselves for use as spares.
- Number of maximum lieutenants lowered to 2
- Pistol cost increased to 25 influence
- Uzi cost increased to 50 influence
- Uzi Ammo decreased to 20 influence
- Overcoats added to items the biogenerator can produce.

- Domination attempts reduced to 2
- Gang dominator time bonuses cannot reduce it lower than 5 minutes
- Showers will clean off lipstick and face paint
2015-06-27 01:12:54 -06:00
Xhuis c5a47adb64 Fighting Styles, 1 2015-06-26 14:19:52 -04:00
phil235 2e61607d3f Merge pull request #10105 from xxalpha/chief
Cleaned some clothing flags.
2015-06-26 19:03:13 +02:00
Cheridan 3c15ee4731 Merge pull request #10157 from KorPhaeron/rightandwrong
Summon Guns once again creates antagonists
2015-06-26 10:22:14 -05:00
Cheridan 530ae039a4 Merge pull request #10124 from Ikarrus/gangtweak2154
Gang Tweaks
2015-06-26 10:09:37 -05:00
Razharas 97aaa5fb8d Revert "Revert "Microbombs and Macrobombs, Nuke Ops start with Microbombs onc…" 2015-06-26 02:44:20 +03:00
Razharas 69d6cd4f94 Revert "Microbombs and Macrobombs, Nuke Ops start with Microbombs once more" 2015-06-26 02:16:02 +03:00
Razharas 454dc14b44 Merge pull request #10117 from Iamgoofball/explosive_implant
Microbombs and Macrobombs, Nuke Ops start with Microbombs once more
2015-06-25 12:49:03 +03:00
KorPhaeron 5170693100 Removed extra line, thanks Incoming 2015-06-25 03:37:48 -05:00
KorPhaeron 91556b65fa Wizards have no sense of right and wrong 2015-06-25 02:10:52 -05:00
Ikarrus 0449b61f5c Bugfixes and sprites 2015-06-24 19:03:46 -06:00
phil235 a029f2852a Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
2015-06-24 21:15:09 +02:00
phil235 ac63896910 - Foam/moke lifetime is no longer affected by reagents volume.
- Remove show_message argument from blob reagent reaction_mob()'s and remove the if(show_message) send_message(). Now send_message is called directly on each blob strike.
- Changed blob reagent effects to depend on volume so blob spore smoke isn't deadly.
- Breathing smoke now reduces its life expectancy and calls reaction(INGEST) with the accurate amount of reagent.
- Adjusted the effects on mobs of some other reagents.
- Adjusted reagent amounts in chem grenades.
2015-06-24 20:58:22 +02:00
phil235 9b616daf8f Merge pull request #9837 from spasticVerbalizer/muteMessageFix
Prevents 'unable to speak' spam on empty message
2015-06-24 20:15:19 +02:00
Iamgoofball ab36f89844 NUKE OPS START WITH MICROBOMBS NOW, nerfs microbombs because I made them way too powerful and 20 of them was actually double the bombcap 2015-06-23 21:37:21 -07:00
Ikarrus 56f1ea6916 They can't recall the shuttle if they blow all their attempts, either 2015-06-23 21:49:11 -06:00
Ikarrus c513ff1dde Gang Tweaks
- Gangs have a maximum of three attempts at dominations
- Added a couple of redone gang tag sprites by Joan
2015-06-23 21:35:56 -06:00
xxalpha 0797226d2e Merge remote-tracking branch 'upstream/master' into chief
Conflicts:
	code/modules/clothing/spacesuits/hardsuit.dm
2015-06-23 21:50:16 +01:00
Iamgoofball a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
Cheridan 62e635484a Merge pull request #10069 from Ikarrus/gangrecruitnerf
Gang Update: Recruitment Edition
2015-06-23 14:33:13 -05:00
spasticVerbalizer 2253a68c4b Merge conflict fix 2015-06-23 18:00:11 +02:00
Ikarrus 67ec200bc7 Few More Changes 2015-06-23 09:12:56 -06:00
Ikarrus 3b326a973b Additional Changes 2015-06-22 22:29:51 -06:00
xxalpha 16504ef0cf Cleaned some clothing flags. Ported turf/Entered optimization from vg. 2015-06-23 01:52:14 +01:00
TheVekter 6b5676bd7f Tweaked the meteor screen shake a bit, grav anoms now throw shit, and rods don't gib anymore. 2015-06-22 01:19:12 -05:00
phil235 5242108c4d a few fixes 2015-06-22 01:39:32 +02:00
phil235 b0cd6d34b1 Lots of work on acids, smoke, foam, reagents reaction() proc.
- fixed the fraction argument in reaction(...., INGESTED, fraction) so the proper amounts of each reagent react, not all of it.
- slight optimization of datum/reagents/reaction()
- small optimization /datum/reagent/proc/reaction_mob
- the smoke's reagents no longer do direct transfer upon crossed()/move() but uses "reagents.reaction( mob, TOUCH)" only.
- fixes no ingesting smoke if it's in the dark.
- removed block gas smoke effect flag from clown mask and other non "actual" gas mask.
- refactor how protection against touched chems being absorbed is done. get_permeability_protection() to get that protection. No more

simple RNG get touched or not, now the amount that touches you depends on your protection and the volume in question.
- changes acid_act to take volume into account.
- chem_smoke now uses process() just like foam, we remove the reaction from crossed() and Move(), it's only done in process() now.
- optimization of effect/smoke, OOP! And now all smoke effects use objprocessing instead of shitty sleep/spawn
- removed mob var/coughedtime.
- add a volume check to item/acid_act(), there's a threshold to be able to melt and then a probability to melt (acidpwr&volume).
- greatly lowered the amount of reagent in the smoke from dead blobspore (so the volume isn't enough for melting)
- human/acid_act(): damage to limbs depends on acidpwr&volume.
- fixes metalfoam not working.
- smoke powder: only one start() call.
- Amound of smoke objects depends on amount of smoke recipe created.
- Adds an argument to add_reagent() to block automatic call of handle_reaction()
- When using reagents/proc/trans_to(), reactions are now only handled after every reagent is transfered and not before.
- Amount of smoke objects depends on amount of smoke reagent created.
- radius of foam reaction depends on amount of foam reagent created.
- The amount of other reagents inside the smoke/foam decides the life expectancy of the effect.
- The amount of reagents in each small smoke cloud/foam cell depends on the amount of other reagents in the initial reaction but also

how much smoke/foam was created (more smoke means dilution of the reagents).
- smoke/foam's reagent reaction on mob decreases the life expectancy of the effect (to avoid reagent duplication)
- The amount of reagent reacting with atoms is less if the life expectancy is high.(to avoid reagent duplication)
- The amount of movement from the smoke now depends on the number of smoke clouds created.
- removing some useless code in chem_grenade/prime().
- When calling human/acid_act(), item acid melting chance lowers after each each successful melt in the list, some of the acid is

"used" to melt that item so the next items have a lower chance to melt (to make melting every clothing harder).
- remove the banned reagent list from sprays, not needed anymore now that acid is nerfed.
- chem_grenade reaction, if there's no reagent left after reaction (smoke/foam/etc, reagents cleared) you don't get the steam effect

and immediate reaction with all atoms around the grenade explosion. (Fixes foam cleaner grenade deleting bloodstains around it as soon

as the grenade explodes, even if the foam hasn't reached the tile yet).
- melted storage items now drop their content instead of deleting everything.
2015-06-22 00:35:24 +02:00
Ikarrus 8eba1d09bf Gang Update: Recruitment Edition 2015-06-21 00:04:36 -06:00
Remie Richards c79963f7b7 Merge pull request #9792 from GunHog/AI_STOLE_MY_BIKE
Malf AI module changes + Mechs for normal AIs!
2015-06-21 00:30:03 +01:00
GunHog 0fadec6b60 Changes lockdown cost from 40 to 30 2015-06-20 13:33:01 -05:00
Swag McYolosteinen 7929b7dcd7 Merge pull request #10031 from Ikarrus/gangfashion
Gang Update: Fashion War Edition
2015-06-20 18:06:19 +02:00
Ikarrus 77d6facca1 Pinpointer now resets after all dominators are destroyed. 2015-06-20 09:10:20 -06:00
Cheridan a2948ba203 Merge pull request #9956 from Jordie0608/whocodesthecodemen
Various admin improvements
2015-06-20 00:53:30 -05:00