Commit Graph

17950 Commits

Author SHA1 Message Date
Akke
0d76c2812d Makes the survival medipen an actual SURVIVAL medipen 2016-09-27 22:34:52 +01:00
oranges
e3ce14d8fc Fix an incorrect call to addtimer (#20691) 2016-09-27 15:59:35 -05:00
TrustyGun
4f16f585dd Lawyers have special speech bubbles (#20693)
Lawyers now have new speech bubbles that is a reference to a popular video game series about lawyers.
2016-09-28 09:54:53 +13:00
oranges
ca492ebcdb Merge pull request #20689 from KorPhaeron/shielded
Shielded Hardsuit Fix
2016-09-28 09:54:15 +13:00
Supermichael777
4d83d15a87 Cat men can now occupy all non-command roles (#20644)
* Cats the erp musical

* I was told without secborgs that their was little reason for this.
2016-09-28 09:53:09 +13:00
Iamgoofball
97fbf903d7 Renames station goal modifier (#20671)
fucked up my "sta"-space-enter speed roundstart and is severely hindering local testing
2016-09-28 09:52:15 +13:00
oranges
93bf7d13c2 Merge pull request #20659 from uraniummeltdown/fasterstockparts
Stock parts now build 5x faster
2016-09-28 09:50:11 +13:00
phil235
20af3ea260 some derps 2016-09-27 22:49:27 +02: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
b8681e9f30 Merge branch 'master' of https://github.com/tgstation/-tg-station into EffectToStructure
# Conflicts:
#	code/modules/events/spacevine.dm
2016-09-27 20:03:26 +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
Cheridan
b84064412b Merge pull request #20690 from Incoming5643/why_did_this_take_months
Fixes weird limb updating bug
2016-09-27 11:29:50 -05:00
Cheridan
70c318698f Merge pull request #20686 from Incoming5643/I_nerfed_it_too_hard
Intensifies the secret satchel system so people will actually use it
2016-09-27 11:24:22 -05:00
Cheridan
1cb43e6f53 Merge pull request #20692 from optimumtact/zombietongue
Make say handling short out earlier to prevent runtimes
2016-09-27 11:20:15 -05:00
Razharas
c4ad0dbdf1 Fixes planted kudzu missing colour and desc (#20681)
* Fixes planted kudzu missing colour and desc

Fixes planted kudzu missing colour and desc

* Fixes language issues

Fixes language issues
2016-09-27 17:56:29 +02:00
Joan Lung
4033224bdb Fixes the proto-kinetic crusher's attack verb tenses 2016-09-27 10:12:51 -04:00
AnturK
dc9abafa6f Merge pull request #20688 from optimumtact/immigrantshavenojobs
Prevent the user selecting jobs before the job list has been intialised
2016-09-27 13:50:31 +02:00
AnturK
0b8dc7b0ae Merge pull request #20683 from ChangelingRain/alloutofbubblegum
Slight bubblegum adjustments
2016-09-27 13:47:20 +02:00
ExcessiveUseOfCobblestone
9d54b28e9b Fixes Intellicard view-locking bug (#20682)
* Update ai_core.dm

* Update ai.dm

* Update mecha.dm

* Update mecha.dm

* Update mecha.dm

* Update ai_core.dm

* Update ai.dm

* Update ai_core.dm

* Update ai.dm

* Update ai_core.dm
2016-09-27 13:40:45 +02:00
XDTM
9809c32b22 Use freon (#20664) 2016-09-26 22:26:21 -05:00
Joan Lung
29b4c6a8ff like a furious buzzing bee, or some metaphor or something. 2016-09-26 16:50:49 -04:00
Joan Lung
cab5342b47 I think you're thinking of the wrong sort of drugs, Madison. 2016-09-26 14:37:16 -04:00
Joan Lung
af137debfb Fixes drakes not throwing people clear when they swoop into them (#20665)
* Fixes drakes not throwing people clear when they swoop into them

* how do i fuck up spans without yooooooou
2016-09-26 08:44:38 +02:00
oranges
df3f2db7ea Make say handling short out earlier to prevent runtimes
The code does not appear to expect a message of the form "", but
does not carry out the check for a message until much later
2016-09-26 06:20:40 +00:00
oranges
464f1a2763 Prevent the user selecting jobs before the job list has been intialised 2016-09-26 06:02:51 +00:00
Incoming
418d45fa9d Fixes weird limb updating bug where once a limb became no_update it could never properly update again 2016-09-26 00:48:32 -04:00
KorPhaeron
a5f762084d Shielded Hardsuit Fix 2016-09-25 21:50:25 -05:00
kevinz000
125209cfd4 stuffs (#20633) 2016-09-26 14:55:12 +13:00
NikNakFlak
55b9c645e5 inb4 powercrepe (#20666)
* inb4 powercrepe.

* Does the razarahas thing
2016-09-26 14:40:10 +13:00
Incoming
2617dabb99 Intensifies the secret satchel system so people will actually use it. 2016-09-25 21:28:56 -04:00
Joan Lung
b13744beb3 Slight bubblegum adjustments 2016-09-25 19:38:40 -04:00
phil235
6102b49a04 Revert "Fixes kudzu loosing mutations on harvest" (#20679) 2016-09-25 22:38:39 +02:00
Razharas
edbd1bc965 Fixes kudzu loosing mutations on harvest (#20662)
* Fixes kudzu loosing mutations on harvest

Fixes kudzu loosing mutations on harvest

* . = ..()

. = ..()
2016-09-25 19:50:53 +02:00
Cheridan
70ff2a9355 Merge pull request #20661 from bgobandit/2spooky
Makes the station 2% more scary.
2016-09-25 12:48:56 -05:00
Incoming5643
6c5db15954 Makes the battlemage armor unacidable like all other wizard armors (#20658) 2016-09-25 08:03:07 -05: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
Cheridan
70f81f13bf Merge pull request #20601 from optimumtact/missinglimbs
carbon mob bullet act now checks it's target zone exists before continuing
2016-09-24 18:42:09 -05:00
Joan Lung
5c18e0d05e Merge pull request #20654 from Incoming5643/why_did_this_take_months
Lizard Sprites and Digitigrade Limbs: Day 0 fixes
2016-09-24 19:36:42 -04:00
oranges
4b892e320a Prevents trying to check armour against missing limbs 2016-09-24 23:19:29 +00:00
oranges
f3cdf22d78 Adds pizza delivery from another unamed station (#20643) 2016-09-24 17:55:25 -05:00
Xhuis
6fd5b3b29f Random dirtiness refactor and turf grammar standardization (#20551)
* Random dirtiness refactor

* Further speeds up MakeDirty

* Removes legacy code

* Replaces flag numbers with defines

* Adds another define in place of an integer

* Re-adds attackby arguments in holofloors
2016-09-25 10:52:42 +13:00
oranges
47ad6e34c2 Chasms now check their dropped atom doesn't go away after sleep (#20645) 2016-09-24 14:52:55 -05:00
bgobandit
3010f362f1 Makes the station 2% more scary. 2016-09-24 03:57:16 -04:00
Joan Lung
2817e260f6 Fixes the colossus firing twice at one location while doing spiral shots (#20639) 2016-09-24 19:54:53 +12:00
AdamElTablawy
90ee0f1042 fixes a capitalization issue and changes desc of cursed heart (#20636) 2016-09-24 19:54:28 +12:00
Kyle Spier-Swenson
f71dc2c9a3 Orbits are now a subsystem (#20632)
* Sleepless perfect orbits #MOGA
We bind to Moved() and use datums and lists to track the orbits, no more sleeps, no more delay.

* Adds some null checks to orbit checks

* Forget to set orbiting.
Also sets orbiters before orbiting, to avoid edge cases of deleting a list then recreating it.

* Improves orbit, adds subsystem for orbits.
Most orbit loc changes will happen on move, subsystem runs every 2 ticks to make up for when that isn't the case.
2016-09-24 19:52:49 +12:00
Hamzah
fa5c08442d Adds a new option to pandemic (#20628)
* Adds a new option to pandemic

This option empties and ejects beaker

* refactored code
2016-09-24 19:52:16 +12:00
Joan Lung
60e6ebaef1 Bubblegum's blood from being hit now has a different visual (#20626)
* Bubblegum's blood from being hit now has a different visual

* joan lung confirmed wild shitcoder
2016-09-24 19:51:42 +12:00
oranges
f2bf5969dc Merge pull request #20617 from Cheridan/criticalshit
Nerfs Critical Hits
2016-09-24 19:51:13 +12:00
oranges
cc3fe031ff Merge pull request #20609 from XDTM/TrueDrinks
Repaths some alcoholic drinks under ethanol
2016-09-24 19:50:39 +12:00