Commit Graph

7166 Commits

Author SHA1 Message Date
Remie Richards 168979ef3a Removes a variable from an unused/unneeded fix to seeing paintings in hand. 2015-04-21 09:37:04 +01:00
kingofkosmos 2044f97400 Removed the if(state == 1) from girders. 2015-04-21 06:53:11 +03:00
Remie Richards a7c9976961 Adds Easels + Canvases, Sprites by Nienhaus 2015-04-20 19:06:24 +01:00
Swag McYolosteinen dc696c16cc Merge pull request #9028 from Fayrik/CentcomExpansion
Centcom change, Deathsquad buff and Abductors get the new advanced camera console.
2015-04-20 19:03:04 +02:00
phil235 658a73d3e8 Merge branch 'master' of https://github.com/tgstation/-tg-station into BundleFix3
Conflicts:
	code/modules/reagents/Chemistry-Holder.dm
2015-04-20 18:44:04 +02:00
phil235 fc158ef7bd - crate mimic have wrong icon var. 8953
- fixes constructable chem master icon when parts are exchanged. 8616
- lowers toolboxes inhands sprite, fixes missing one. 8433
- fixes exploit in pandemic to avoid the bottle creation cooldown. 8031
- fixes chem grenade not getting to southwest side. 8019
- remove handle_env, /handle_random_events() and handle_blood at carbon level, identical to living level.
- fixes human bodytemp dropping to 20C in normal environment. (32.5C 90.5F when naked now)
- you now need both adequate headgear+suit to protect against pressure. (removing two defines)
- fixes alien hunter being immune to env fire in stalk mode (removing hunter/handle_env())
- fixes monkey not metabolizing reagents, also make larva metabolize them. 7108
- remove calculate_affecting_pressure from monkey level, simplification.
- refactors monkey's handle environment, no more handle_temp_damage proc, it's all in handle_env.Fixes temperature alert not showing for monkey.
- refactor monkey/handle_fire (similar to alien/human now.)
- replaces morphine with stimulants in adrenal implant. 8832
- refactor handle_breath_temperature.
2015-04-20 18:15:06 +02:00
kingofkosmos e878ca4c8c Fixes #9071 2015-04-20 19:12:27 +03:00
Ikarrus 9c10cec883 Gang mode changelog and minute tweaks
- Gang mode changelog
- Recruitment doesn't cause an obvious seizure any more
- Removed reduced usage on territory spraycans
- Spraycans will notify you if the area you are spraying at is not a valid one for tagging
2015-04-20 08:31:19 -06:00
Thunder12345 be6029a659 Now with more (span) class
(user)DANGER (user)DANGER!
2015-04-20 13:02:34 +01:00
Thunder12345 1bf931d731 Refactors landmines
Replaced the minepayload var and the switch() in triggermine() with a
proc for the mine's effect.
Removed unnessecary New() proc.
Removed the existing uglymine icon state and renamed uglyminearmed to
uglymine.
2015-04-20 12:36:06 +01:00
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
MrPerson 8f0cda1afa More screen alerts
High (uses "Hallucinating" icon), blind, embedded objects, asleep, weightlessness, new law (silicons), hacked (cyborgs), and locked down (cyborgs). The new law alert times out on its own after 30 seconds. The code for timing out is rough but works.

Sprites are provided by ZyloWalsh and can be seen at https://tgstation13.org/phpBB/viewtopic.php?f=11&t=3167
Drunk isn't in atm because I was waiting on phil to finish some reagent stuff. Hallu kind of ruined the "surprise" so I decided not to use it. Weaken/stun/paralysis are also not in right now because I'm lazy. All the sprites are included even if they're unused.

Added a proc human/has_embedded_objects() that returns 1 if src has any objects embedded in any limbs.
2015-04-18 16:54:36 -07:00
phil235 4c21750513 Merge branch 'master' of https://github.com/tgstation/-tg-station into Chems
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
	code/modules/mob/living/carbon/carbon.dm
2015-04-18 20:33:19 +02: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 b7db78cbaf Merge pull request #8741 from kingofkosmos/girderrakennus
Girder & machine frame disassembly changes
2015-04-18 13:06:04 +02:00
Fayrik 558f46af1e Forgot the encryption key sprite. 2015-04-18 00:41:15 +01:00
Fayrik 84df0192f4 Buffs Deathsquads. 2015-04-18 00:06:17 +01:00
Jordie0608 26ca19e07d Merge branch 'master' of https://github.com/tgstation/-tg-station into tfwyoubreakyourownfix
Conflicts:
	code/modules/mining/mine_items.dm
2015-04-17 18:02:45 +10:00
phil235 6807b1ae48 Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienNestPixelFix
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
2015-04-16 23:44:12 +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
Jordie 4c1a1c8c87 Merge pull request #8967 from phil235/BundleFix1
A big bundle of fixes
2015-04-16 18:18:53 +10:00
Jordie 210eedbb48 Merge pull request #8841 from GunHog/Bot_Radio_And_Newscasters
Bot fixes and PDA upgrades!
2015-04-16 18:18:44 +10:00
Jordie0608 c364d1558a fireaxe cabinet recode 2015-04-16 17:40:15 +10:00
Cheridan 87edea4eab Merge pull request #8969 from phil235/BundleFix2
Another bundle of fixes
2015-04-15 21:08:13 -05:00
kingofkosmos d315681120 if(state == 1) added to few places. 2015-04-15 19:56:56 +03:00
Swag McYolosteinen 36cac2405d Merge pull request #8932 from Iamgoofball/patch-56
Fixes incendiary grenades
2015-04-15 13:03:03 +02:00
Cheridan 26a974a8c3 Merge pull request #8943 from MrPerson/ied_fixes
IED fixes
2015-04-14 19:40:50 -05:00
phil235 d5318a033b Merge pull request #8933 from Cheridan/snackbar
New barsign!
2015-04-15 00:33:18 +02:00
kingofkosmos 6ba41ca7a7 Do_afters now use "target = src", removed oldloc-stuff.
False wall construction had a bug if you had exactly 2 sheets in your hand, it wouldn't work - fixed it.
2015-04-14 19:45:08 +03:00
phil235 2ed906b990 Fixes inhand sprites for eggs.
Fixes heart underwear sprite being too big.
Fixes being able to push a janicart through plastic flaps.
Fixes ERT medic closet starting with a combat defib with no cell. Empty combat defib can now get a cell inserted.
Fixes inconsistency in nukeop pinpointer upon activation, it now says standard pinpointer message plus the current mode (shuttle or disk).
2015-04-14 17:41:36 +02:00
phil235 0f6a60600d Fixes alien nest overlay appearing above standing mobs. Also fixes lying mobs appearing in front of standing mobs.
Fixes alien humanoid custom pixel shift being reset by life(). Refactors how pixel reinitialisation (when standing or lying or during animations) is done. Adding get_standard_pixel_y_offset() proc (and same for x), removing lying_pixel_y_offset var from all mobs, adding custom_pixel_x_offset (and y) so Wjohnston can play with his aliens.
2015-04-14 14:55:05 +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
Xhuis 87541dabc2 Progress 2015-04-13 19:12:29 -04:00
MrPerson 0a6fb70137 IED fixes
Fixes #8919 - can pixel_x/pixel_y is inherited by the IED after construction
Fixes an unreported issue where the can underlay of IED's would be rendered underneath your HUD when it was in your hands.
2015-04-13 07:00:19 -07:00
Jordie 77cd7476a1 Merge pull request #8872 from optimumtact/patch-1
Fix electronics check in airlock code
2015-04-13 18:25:05 +10:00
Jordie d8ef9ecb44 Merge pull request #8777 from CosmicScientist/SpaceCarpTatorItem
Adds space carp traitor item and carp plushie "attack"
2015-04-13 18:22:53 +10:00
Jordie e6143f6493 Merge pull request #8810 from AnturK/everybodywaskungfufighting
Adds martial art datum and three styles
2015-04-13 18:22:37 +10:00
Jordie ae120db87c Merge pull request #8728 from AnturK/action_button
Generic Action\Action Button System
2015-04-13 18:22:08 +10:00
Jordie0608 8610d24a75 merges secure closet code into normal closets, fixes overlay bugs 2015-04-13 17:38:57 +10:00
Iamgoofball 0dd03a7201 you didn't see anything 2015-04-12 19:13:24 -07:00
Cheridan 729be13486 New barsign!
In honor of https://www.reddit.com/r/SS13/comments/322cm1/ss13_confirmed_isis_recruitment_shill/

We need more subliminal messages to appease our ISIS overlords
2015-04-12 21:00:24 -05:00
Iamgoofball 18207ae363 Fixes incendiary grenades 2015-04-12 18:02:22 -07:00
Cheridan 141d577bba Merge pull request #8895 from phil235/WindowFix
Windows, CPR, lipstick fixes
2015-04-12 13:06:42 -05:00
Swag McYolosteinen ffd0db2b7b Merge pull request #8581 from MrPerson/lighting_2015
Object based lighting system
2015-04-12 13:14:32 +02:00
Jordie dc3cc0295a Merge pull request #8887 from sawu-tg/spray2
Fixes Spraycans bugs
2015-04-12 13:44:36 +10:00
xxalpha 91cdab2b9c Added implants to Nuke uplink. Removed random implant spawner. 2015-04-12 03:18:44 +01:00
CosmicScientist 6f357b1d63 Merge branch 'master' of https://github.com/tgstation/-tg-station into SpaceCarpTatorItem 2015-04-11 22:11:10 +01:00
phil235 5f169e8e47 Remove SpeciesCanConsume() proc, replaced by iscarbon checks.
Remove alloweat var from masks, remove MASKCOVERSMOUTH flag from mime and clown masks so you can still eat through them.

Some adjustments in surgery checks for bodyparts covered.
Fixes a runtime in weapon/energy attack_verb.

Humans can now CPR monkeys.
Slight changes to CPR code.
Fixes runtime with drones trying to do CPR.

Rewrites /obj/item/weapon/reagent_containers/proc/canconsume to be less shitty.

Adds an is_mouth_covered() proc to carbons to check for mask and headgear with MASKCOVERSMOUTH or HEADCOVERSMOUTH, with argument to restrict the check to only mask or only head.
2015-04-11 22:16:42 +02:00