Commit Graph

5342 Commits

Author SHA1 Message Date
Joan Lung
b5b4037e2e More istypes replaced with helpers (#20767)
* shouldn't you be merging these by now

* my oh my do we have a lot of these

* a fellow pedantic shit
2016-10-03 13:40:13 +13:00
Joan Lung
bdcb16113a Adds a few turf istype helpers (#20754)
* a very calming act
when the world is too much, too fast

* i'm tired
but i have to be efficient, infinite

* lick your lips at the sight of me
a fantasy made reality
2016-10-01 19:25:46 +02:00
Joan Lung
dff4db726a Replaces a bunch of istypes with their proper macros (#20739)
* Replaces a bunch of istypes with their proper macros

* i'm not sure doing a 100+ file changed pr on a whim is something you do when bored
especially if you do it by hand because you never actually learned the regex that would let you automate it

* i'm just... gonna do this, because that check was true a lot and it shouldn't matter
2016-09-30 20:21:08 +02:00
Cheridan
e43b06f750 Merge pull request #20591 from ChangelingRain/proofofconceptantagdatum
"Working Datum Antagonists"
2016-09-29 13:33:59 -05:00
phil235
194398cbbd Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
# Conflicts:
#	code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
#	code/game/objects/effects/portals.dm
2016-09-29 01:44:27 +02:00
Joan Lung
aaefef46b8 Merge pull request #20732 from optimumtact/justhrefthings
Fix multiple href exploits from incorrectly scoped locates
2016-09-28 19:00:44 -04:00
Joan Lung
fde8904309 Merge pull request #20714 from phil235/EffectToStructure
Changes a few children of obj/effect to be children of obj/structure.
2016-09-28 18:12:52 -04:00
oranges
18b1b9c328 Space carp ensure they still exist after animation sleep (#20710)
This stops a runtime where the space carp Swell was called and
get_turf(src) resolved to null
2016-09-28 11:01:43 -05:00
oranges
8b7eb11df9 Fix multiple href exploits from incorrectly scoped locates
Also adds a helper to flatten a keyed list to it's contents as it
turns out that byond cannot locate in a keyed list
2016-09-28 06:55:45 +00:00
TheCarlSaganExpress
36d6695319 Requested changes to #20637 (#20701)
* Requests by Phil

* Additional Code
2016-09-28 08:54:42 +02:00
Jordie
5273651be2 Merge pull request #20706 from Cuboos/Vape_Fix_for_real_this_time
Vape Fix, no more Admin Spam edition.
2016-09-28 16:50:51 +10:00
ExcessiveUseOfCobblestone
f02798d87d IMMENSE BUFF TO SECURE BRIEFCASES/WALLSAFE (#20668)
SAY GOODBYE EMAG USERS! THE AGE OF THE MULTITOOL IS UPON US!

In Short: Removes Emag Function [aka Requiring a multitool], and has a lower chance to successfully hack [from 40% to 33%]

It doesn't make sense that something that has no place for an ID can be swiped with an overglorified ID. Git gud and use the multitool. Now when someone puts secure items in the secure safe, people won't laugh at them [i mean they probably still will, but it's ok].
2016-09-28 09:51:53 +13:00
phil235
2d2975f783 Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.
This just adds some vars that the refactor will use. Putting this in a separate PR prevent the damage refactor PR from becoming too big (number of files changed) and hard to read and review.

Introduces the resistance_flags bitflag that replaces unacidable and burn_state.
Moves the armor var from item to /obj level and gives specific armor values to many objects, the armor list also gets two new armor types: fire and acid, which will be used in the refactor. the new fire and acid armor values are given to plenty of items.
2016-09-27 22:33:08 +02:00
phil235
6809603669 Changes obj/effect/blob,spider,swarmer,energy_net,spacevines to be ob/structures instead, since you can hit and destroy them.
Adds a large ash and large molten item decal (for future use)
simplifies decal/cleanable/replace_decal() code a bit.
Changes construction() proc to on_construction() for consistency, same for deconstruction().
Made a deconstruct() proc for machinery and computer (also for future use).
2016-09-27 19:58:27 +02:00
Cuboos
8bcffdd908 OKAY IT WILL WORK THIS TIME I HOPE OH GOD HELP ME 2016-09-26 21:23:51 -07:00
oranges
5581fd9c72 Fix simple mobs spawning into nullspace + helper for spawning atoms (#20669)
Fixes badminbomb cores and spawner grenades starting out mobs in
nullspace, also adds a helper proc to do spawning
2016-09-26 08:47:03 +02:00
TheCarlSaganExpress
7e1331bc04 PDA Adjustments (#20637)
* Adjustments to the PDA. Ejecting a cartridge from the PDA no longer falls to the ground.

* Requested Changes
2016-09-26 14:57:30 +13:00
Cuboos
385d75a20a Vapes are coming to SS13 (#20629)
Bringing the Vape Nation to Space Station 13! Adds new E-cigarettes (other wise known as vapes) to the Cigarette vending machines as contraband. You fill them with reagents instead of dried plants. You can modify them by opening them with a screw driver and increasing the voltage with a Multitool. This creates a small smoke puff with what ever reagent is inside, it also uses reagents faster. You can also maximize the voltage using an emag, which will fill the room with reagent smoke and point you out as a filthy traitor -- useful to spreading meds to an entire room (or poison). Has a 15 percent chance to explode while in use after being emagged, which stuns for a few minutes and deals some burn damage to the mob's head. Will explode and gib you if filled with plasma or will light you on fire if filled with welding fuel.

Fun uses

    Fill with Leporazine and Salbutamol for ghetto EVA
    Fill with Omnizine for constant healing
    Fill with meth and be a pain in the ass for security.
    Fill with mannitol as a quick way to cure brain damage
    Fill with Synaptizine and never be bothered by BZ or hallucination sting ever again.
    Fill with Bath Salts and never get stunned again (also die)
    Fill with welding fuel and leave it around for some poor assistant to find.
    Fill with plasma and put it in the mouth of your assassination target (be sure to run)
    Emag and fill with virus culture, spread nurgle's plague.
    Mutli-tool it and be a tool your self.

Added a new explosion sound, a small "pop" bang. Intended for when the vape blows up after being emagged, may also be useful for other things, feel free to use (preview https://dl.dropboxusercontent.com/u/9654207/pop_expl.ogg)

Added a Vape Naysh shirt as contraband to the clothing vendor. Look like the tool that you are.
2016-09-25 20:21:59 +13:00
oranges
a39beaa227 Refactor the experimental welding tool slightly (#20646) 2016-09-24 16:49:35 -05:00
PKPenguin321
425a09f226 makes saber sheath examine fancier 2016-09-22 15:47:53 -07:00
TechnoAlchemist
a93bfc39e0 Officer's Sabre Tweaks (#20565)
Allows for quickdrawing the sabre.
Also changes the attack text since it's no longer a rapier, and it doesn't make sense that it can dismember with point lunges and thrusts.
2016-09-23 10:25:25 +12:00
Cyberboss
96087dcf67 Station Blueprints now contain wire legend (#20559)
Added a submenu to the Station Blueprints that lists wire color purposes for the round for NT made items
Does not list duds
Removed WIRE_ELECTRIFY as it was synonymous with WIRE_SHOCK
2016-09-23 10:24:57 +12:00
Joan Lung
d41971d7ed Merge branch 'master' of https://github.com/tgstation/tgstation into proofofconceptantagdatum
Conflicts:
	code/game/gamemodes/game_mode.dm
2016-09-20 19:03:20 -04:00
Cheridan
a930355581 Merge pull request #20572 from AnturK/godisdead
Removes Hand of God gamemode.
2016-09-20 13:46:52 -05:00
AnturK
6700f30012 Repathes structures to fluff, traps to their own path 2016-09-20 17:36:27 +02:00
yackemflam
5d2255e0e5 Syndicate Ninja (#20520)
* Syndicate Ninja

* Update uplink_kits.dm
2016-09-20 21:47:24 +12:00
Xhuis
ea21aa4e00 Highlander Patch (#20211)
* Highlander changes

* Prevents losing your claymore F O R E V E R

* Adds partial bloodthirst sating from attacking

* Reworks bloodthirst

* Forgot to push this

* Adds a disk-capture mechanic

* Changes based on feedback

* Bugfixes

* Makes the pinpointer functional
2016-09-20 21:37:08 +12:00
kevinz000
8a83df0d3b Arm Combat Cybernetic Implants (because toolset arm shanks weren't enough) (#20544)
* combat_cybernetics

* flashlight-arms

* surgery

* thiswillprobablyfixit...

* nopethatdoesntwork

* revert

* nerf

* prayingtornjesusitcompiles
2016-09-20 21:36:11 +12:00
Hamzah
9496e1631a Limb grower (#20501)
Added a Experimental Limb Grower to the medbay department, now medical stuff can grow synthetic limbs using Synthflesh to help crew that suffer any work related accidents.
2016-09-20 14:53:43 +12:00
Joan Lung
3ec7e81131 "A Working Datum Antagonist" 2016-09-19 13:03:22 -04:00
Joan Lung
ba6acc2ea0 Reduces the copypaste in cleanable decal code (#20491)
* Only holy water will clean blood runes

* macro!

* holy no longer required

* i am far too unethical and spite driven half the time

* it appears code done in the middle of the night in the hope that oranges hasn't merged my pr isn't always that good
2016-09-19 09:45:12 +12:00
AnturK
faa033c5f3 Fixes coordinates in grenade admin message (#20576) 2016-09-18 15:26:15 -05:00
erwgd
a68a0a912b bone dagger now contains no materials (#20575) 2016-09-18 15:25:14 -05:00
AnturK
93f444fd38 Removes Hand of God gamemode. 2016-09-18 13:32:26 +02:00
phil235
8e8061e851 Wearing colored glasses colors your vision, if you want to. (#20499)
* Adds semi-transparent colored fullscreen overlays which are used by glasses with tint_color.
Currently only red, blue, and green are available. And only nightvision glasses currently have a tint_color when worn (green).

* Completely rewrites how I did color tinting. We now use datum/client_colour and the client's color var.
I fixed items in our inventory UI being colored when using client.color.
I added an altclick() option on all glasses to toggle a new pref regarding the use of glass coloring your view.
I made a lot more glasses use vision coloring.
I fixed Thermal HUD Scanner not having its action button to switch hud type.
2016-09-17 16:28:50 +12:00
Joan Lung
313ecf3843 Merge pull request #20498 from phil235/RewriteMegaphone
Megaphones no longer have special say code to handle their effect.
2016-09-14 16:35:01 -04:00
Cheridan
2a0168abdb Merge pull request #20434 from ChangelingRain/idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
Moves all beam icon states to beams.dmi
2016-09-13 11:55:24 -05:00
phil235
441a88c488 Megaphone no longer have special say code to handle their effect.
The megaphone is no longer used by clicking it and entering a message, you simply keep it in your active hand and talk normally.
Remove the insults feature of the emagged megaphone. The span of the emagged megaphone is now big and red.
2016-09-13 18:27:55 +02:00
AnturK
4709b5229b Merge pull request #20475 from optimumtact/throwat
Fix a bunch of incorrect throw_at proc definitions that caused a runtime
2016-09-13 15:41:00 +02:00
oranges
ccea988320 Stunbaton throw now only stuns living mobs (#20474)
Other type paths do not have the required Stun and Weaken procs and
therefore cause runtimes
2016-09-13 15:40:21 +02:00
Joan Lung
0067bd1332 Adds brass, used to construct various brass objects (#20419)
* Adds brass, used to construct various brass objects

* brasshole

* give em the brass

* give em more brass

* DYNAMIC

* VAR MURDER SPREE

* brassy

* acceptaphil

* this is super against my general preferences but eeeeeh sure okay i guess
2016-09-13 12:16:28 +02:00
oranges
6fbcc6e26b Fix a bunch of incorrect throw_at proc definitions that caused a runtime 2016-09-12 22:09:52 +00:00
Joan Lung
179b0b532d Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
Conflicts:
	code/game/objects/structures/grille.dm
	icons/effects/beam.dmi
2016-09-12 17:14:39 -04:00
TechnoAlchemist
eec3391270 Allows for sabre renaming. (#20367)
* Allows for sabre renaming.

* That's not supposed to be there

* Applies unique_rename to all /weapons

* fixes my stupid asshole
2016-09-13 09:05:30 +12:00
phil235
443a4501ec Carbon Dismemberment , second attempt. (#20461)
* - I rearranged X_defense.dm mob files, more damage_procs.dm.Here's what's inside:
* X_defense.dm: is for the procs of attacks onto the mob, all the XXX_act() proc (things happening to the mob), as well as protection check and get procs (armor, ear prot, projectile dismemberment)
* damage_procs.dm: actual damage procs like adjustBruteLoss() getfireloss, any proc that handles damaging.

- some bugfixes with gibspawner effects.
- monkey's bodyparts can be dismembered and are used to create its icon.
- brains are no longer carbons.
- all carbon have bodyparts that can be dropped when the mob is gibbed.
- adminspawned bodyparts now have a default icon.
- robotic parts are now a child of bodyparts.
- health analyzer on alien/monkey shows damage on each limb
- added admin option to add/remove bodyparts for all carbon (instead of just remove on humans)
- Fixes keycheck message spam for janicart and all when trying to move.
- Fixes bug with buckling to a scooter while limbless.
- removed arg "hit_zone" in proj's on_hit() because we can already use the def_zone var (where hit_zone got its value)
- Fixes mob not getting any damage when hit by a projectile on their missing limb, despite a hit message shown). carbon/apply_damage() now when we specify a def_zone and the corresponding BP is missing we default to the chest instead of stopping the proc. Consistently with how human/attacked_by() default to its attack to chest if missing limb.
- Fixes mini uzi icon when empty and no mag (typo).
- I renamed and changed a bit check_eye_prot and ear prot
- renamed flash_eyes to flash_act()
- I made a soundbang_act() similar to flash_act but for loud bangs.
- added a gib and dust animation to larva.
- husked monkeys
- no damage overlay for husk or skeleton.
- damage overlay for robotic limb now.
- no damage overlay when organic bodypart husked.
- one handed human with a bloody hand still get a bloody single hand overlay.
- fix admin heal being unable to heal robotic bodyparts.
- slightly touched robotic bodypart sprites (head one pixel too high)
- Fixes 18532 "beheaded husk has hair".
- Fixes 18584 "Ling stasis appearance bug"
- no more eyes or lipstick on husks.
- can remove flashes/wires/cells from robot chest and head with crowbar.
- Fixes not being able to surgically amputate robotic arm/leg.

* More merge conflict fixes and adding the new files I forgot to add.

* of course I forgot birdstation

* More typos and stuff I forgot to undo.

* Fixing a typo in examine.dm
Removing an unnecessary check.
Making admin heal regenerate limbs on all carbons.
Monkey-human transformation now transfer missing limbs info and presence of a cavity implant.
NODISMEMBER species can still lack a limb if the mob lacked a limb and changed into that new species.
Changeling Regenerate ability now also regenerate limbs when in monkey form. (and remove some cryptic useless code)

* Fixing more conflicts with remie's multihands PR.

* Fixes runtime with hud when calling build_hand_slots().
Fixes lightgeist healing not working.
Fixes null.handle_fall() runtimes with pirate mobs.
Fixes typo in has_left_hadn() and has_right_hand().

* Derp, forgot to remove debug message.
2016-09-12 19:33:50 +02:00
Remie Richards
8dd507995a Fixes conflicts, dang it people if(src != user.l_hand && src != user.r_hand) is shit code, shiiiiiiiiiiit. 2016-09-10 20:42:34 +01:00
Remie Richards
c50fa5729c Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work 2016-09-10 20:28:23 +01:00
Joan Lung
fbe2430ff8 Moves all beam icon states to beams.dmi 2016-09-10 13:09:44 -04:00
Cheridan
94bb371f30 Merge pull request #20402 from ChangelingRain/iwasabillionlittlepiecestilyoupulledmeintofocusastronomyinreverseitwasmewhowasdiscovered
Makes cult structures destructible and readds them
2016-09-10 11:43:59 -05:00
Joan Lung
d8e804ac9a ah, of course 2016-09-08 10:18:41 -04:00