Commit Graph

369 Commits

Author SHA1 Message Date
Cheridan c347721a6a Merge pull request #9058 from Ikarrus/gangupdate2
Gang Update v3
2015-04-20 03:24:10 -05:00
Ikarrus 4ff044dc78 Gang v3 has been tested and is now good to go! 2015-04-19 22:26:15 -06:00
Ikarrus af7131c7ad Gang Update v3
The coding isn't done yet, but the design is. So comment on the design while I smooth out the code.

tldr; Gang mode rewrite to follow my original vision: Slower and longer rounds with less deathmatching, and a resource both teams have to fight over

NEW OBJECTIVE: CLAIM HALF THE STATION AS TERRITORY
- Gang bosses can spawn special spray cans that can be used to tag areas
- Any gang member can tag areas.
- Gang tags must be removed before another one is placed in the same area
- Game mode no longer automatically ends when the boss dies. It now ends when either the station evacs, or one gang claims more than 50% of the station areas
- Boss can promote gangers into his lieutenants, which basically means adding more bosses
- Lieutenants can do anything bosses can except promote others to lieutenant

NEW RECRUITMENT TOOL: PENS
- Recruitment pens replace flashes
- Looks exactly like a pen. Stab people to recruit them.
- Recruitment is silent but obvious to the perceptive (Causes a brief seizure)
- Cooldown between uses that gets longer as the gang gets larger

NEW TOOL: GANGTOOL
- Replaces the recaller device. Can still recall the shuttle.
- Provides overview information about the gang (membership size, income amount and time)
- Can spawn pistols and ammo
- Can spawn additional recruitment pens
- Can spawn additional gangtools (For personal use, or promoting a single ganger to lieutenant)

NEW CURRENCY SYSTEM: NAME IS WIP
- Gangtools purchase items with new currency with the placeholder name "Supply Points (SP)"
- Supply points are collected every 5 minutes. The more territory a gang has claimed, the more points they get.
- Supply points are accumulated per-gang. Having more gangtools does not intrinsically give you more points to use.
2015-04-19 01:00:17 -06:00
phil235 edba4e0529 Fix reagents not using current_cycle var for their stuff.
Fixes current_cycle being incremented twice for certain reagents.
Fixes flash never working for /datum/effect/effect/system/reagents_explosion because of a typo.
Readding nitroglycerin reagent, it can now be stabilized with stabilizing agent and can explodes when exposed to 474K (like blackpowder).
Readjusted black powder explosion: no more flash (like nitroglycerin), tweaked the values a bit to not nerf blackpowder explosion.
Adding changelog.
2015-04-18 20:30:35 +02:00
phil235 a01b8ef435 Reorganizing the reagents files. Goon chems are no longer in separate files.
All reagents are back to being metabolized every tick. I adjusted the goon chem so their effects aren't changed too much.
Removing some probability and randomness from goon chem effects to make it more predictable.
Adding overdose to space drug.
Making a drug reagent category.
Changed check_ear_prot() for carbons: alien are now immune, and monkey checks their head for ear protection.
Changed flashpowder flashing code and blackpowder explosion code to use already existing procs.
Moved chemical_mob_spawn and goon_vortex procs to /datum/chemical_reaction/
Fixes double overdose message for sugar.
Remove the "if(!M) M = holder.my_atom" at the beginning of a lot of on_mob_life procs, you already can't call on_mob_life if M is null

(Chemistry-Holder.dm).
Moved random_color_list to datum/reagent/colorful_reagent
Nerfed healing power of stimulant. Buffed ephedrine a bit.
Fixes some goon chem on_reaction() proc leaving resulting chem behind when they shouldn't.
Removes Life, nitroglycerin and Corgium reagents. They're now only a chemical reaction.
Moved grenade launcher and syringe gun from reagents module folder to gun folder.
Added a message for the ghost when someone is trying to revive its corpse with strange reagent. (like defib)
Fixes Frost oil and other consumable reagents using current_cycle var.
Fixes runtime where during metabolization a reagent removes another then the latter still calls on_mob_life().
2015-04-16 22:07:24 +02:00
phil235 081bae6740 Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
2015-04-14 13:54:36 +02:00
Swag McYolosteinen 853009f7e0 Merge pull request #8157 from Xhuis/shadowling_gamemode
Shadowling (MERGE-READY!!)
2015-04-11 17:51:23 +02:00
Xhuis c9338f7212 Shadowling: RELEASE EDITION 2015-04-11 11:42:02 -04:00
Cheridan f537b43108 Merge pull request #8789 from phil235/BeartrapFix
Pull, resist, beartraps
2015-04-08 08:38:01 -05:00
Iamgoofball c06ad7e6b8 moved process() to datum. made /datum/reagents/ process instead of the containers. 2015-04-07 17:13:59 -07:00
Iamgoofball 54154bec12 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive 2015-04-07 16:21:07 -07:00
phil235 6b83575b28 Merge branch 'master' of https://github.com/tgstation/-tg-station into BeartrapFix
Conflicts:
	code/modules/mob/living/living.dm
2015-04-07 20:27:37 +02:00
phil235 34a2b3be5b Flying animals no longer triggers mines and mousetraps.
Space carps are flying animals now.
Adding changelog
2015-04-07 20:20:29 +02:00
MrPerson 94c0c1598d Fixes cleaner grenades
Fixes #8757
Default for locate is "in world"!
2015-04-05 16:55:17 -07:00
phil235 0b403b3b03 Fixes lack of dna in old blood.
Fixes some comments about blood procs in atoms.dm
Small tweak in xeno blood blood_DNA.
2015-03-31 19:48:44 +02:00
Jordie c8e0c16d09 Merge pull request #8520 from MrPerson/effect_cleanup
Effect pooling
2015-03-30 01:21:40 +11:00
Jordie 0cbcda509d Merge pull request #8448 from AnturK/gothisway
Adds arrow graffiti
2015-03-25 16:29:15 +11:00
MrPerson b6c71dc50d Effect pooling
obj/effect/effect all pool themselves.
PoolOrNew() can now be passed a type and a list instead of a type and a location. In that case, the list will be passed to New() via arglist().
RCD's now delete their spark system and properly garbage collect.
2015-03-24 11:44:49 -07:00
Iamgoofball 434265afa0 Reagent Decals 2: Black Powder Boogaloo 2015-03-22 02:04:31 -07:00
MrPerson 9229f72573 Fix up certain chemicals to not overwrite Del(). Meh.
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_reagents_hopefully

Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
2015-03-21 23:04:53 -07:00
Razharas 2271499db7 Merge pull request #8058 from Iamgoofball/explosive
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
2015-03-21 09:54:11 +03:00
AnturK 97ed18abfa - Adds arrow graffiti 2015-03-20 19:41:59 +01:00
xxalpha 50e4b1a024 Fixes jetpack trail animation.
Fixes jetpack trail animation 2.
2015-03-17 21:22:47 +00:00
Iamgoofball 4def104810 Makes smoke effect all /mob/living. 2015-03-14 22:26:14 -07:00
MrPerson 7c305305b7 Fix reagent garbage collection hopefully
I say hopefully because stuff that collects successfully locally likes to fail on sybil.
2015-03-14 16:52:49 -07:00
Iamgoofball e5a3694c0f Adds Napalm as a reagent and merges old napalm into Phlog. Fixes some foam stuff. 2015-03-08 19:43:17 -07:00
Iamgoofball 8dfcbd8b24 Changes smoke back to TOUCH reaction. 2015-03-08 17:04:45 -07:00
Iamgoofball 573aea927b Removes newcrit, fixes, changes, old chems now process every tick as per usual, only goonchems process every 3 ticks now. 2015-03-08 16:43:57 -07:00
Iamgoofball e6f257d413 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
	code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm
2015-03-08 14:26:52 -07:00
Mandurrrh 48daa155d7 Fixes #8116 trails bug 2015-03-04 19:53:11 -05:00
Iamgoofball 3964cb3126 Adds heart attacks properly. 2015-03-02 20:50:48 -08:00
Ikarrus c62d387a1d Randomizes Order of Job Spawn Points
The ticker's setup() will shuffle the list of spawn points, so jobs won't always predictably spawn bottom-up and left-to-right
2015-03-02 20:01:36 -07:00
Iamgoofball 3b2963dcab More changes, more bugs 2015-02-28 10:19:52 -08:00
dannno 9b1fa2479b conflict fixing + changelog 2015-02-26 16:48:11 -05:00
dannno 23ecfeebf8 THE OWL RETURNS: PART 4: PRODUCT PLACEMENT
- adds The Owl and The Griffin prize toys to the arcade
- adds The Owl and The Griffin posters (legit and contraband respectively)
- adds The Nest barsign
2015-02-26 16:36:44 -05:00
Razharas 588c79873f Merge pull request #7562 from Iamgoofball/drugs
GOONCHEM: Part 4: Pyrotechnics, Drugs, and Misc. Chemicals
2015-02-25 08:26:21 +03: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
dannno 44ea489940 THE OWL RETURNS: PART 2: REVENGE OF THE GRIFFIN
- adds The Griffin costume to the autodrobe
2015-02-23 17:30:17 -05:00
dannno e8fb3d1f05 THE OWL RETURNS: PART 1: THE PLASMA RISES
- all owl items resprited
- owl wings added; suit slot item, wings are toggleable
2015-02-23 16:49:17 -05:00
Iamgoofball e24e94544e Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
Conflicts:
	code/modules/food&drinks/food/snacks_meat.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
	icons/obj/drinks.dmi
	icons/obj/food.dmi
2015-02-20 22:00:53 -08:00
Cheridan fe3764dae8 Merge pull request #7765 from Thunder12345/glovening
[REFACTOR] Reworks maintenance fake insulated gloves
2015-02-20 14:24:54 -06:00
Cheridan e861281a03 Merge pull request #7783 from Delimusca/minesofshame
cleans up mines
2015-02-20 12:16:14 -06: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 da4f8e74d8 Merge pull request #7733 from Cheridan/reagent_foam
Reagent Foam
2015-02-18 21:43:50 -08:00
Delimusca 792becf2b3 fixes kickmine runtime 2015-02-17 09:56:16 -07:00
Delimusca bca0a7b320 readds kick mine 2015-02-17 09:28:24 -07:00
Delimusca f12d3d9fbf cleans up mines 2015-02-17 00:08:28 -07:00
Thunder12345 702419f265 Merge remote-tracking branch 'upstream/master' into glovening 2015-02-16 12:24:06 +00:00
Thunder12345 9f471cb7e4 Reworks fake yellows
Replaces the varedited white gloves in the maint loot spawner list with
a subtype of insulated gloves, with the siemens coefficient changed to 1
and a different desc.
2015-02-16 12:20:06 +00:00
Cheridan 85ec168881 Foam spreading now respects type. 2015-02-14 13:32:32 -06:00