070477d650
Merge pull request #20787 from Militaires/okayitworksnow
...
GIANT INTENT REFACTOR (separates it into 4 different harm, help, disarm and grab procs)
2016-10-02 23:54:09 -05:00
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
de19e36a51
Removes morphine from nurse spiders ( #20773 )
...
Fixes spider web, cocoon, spiderling sprites
Halves cocoon breakout time, fixes camera going to nullspace
2016-10-03 13:35:56 +13:00
f501d9e1cd
Stable mutation toxins ( #20677 )
...
Recipes:
Add these to unstable mutation toxin. These were all obtainable already.
Human: blood
Lizard: radium
Flyperson: mutagen
Golem: silver
Podperson: EZ nutrient
Jelly: slime jelly
Abductor: morphine (doesn't make much sense but it's all i could think of)
Android: teslium
These need ADVANCED mutation toxin (from black slimes) instead of unstable.
Skeleton: milk
Zombie: toxin
Ash Lizard: advanced mut. toxin + lizard mut. toxin + ash
Shadow: liquid dark matter (stabilized ofc) + holy water
Plasmaman: skeleton mutation toxin + plasma + uranium (if you can shoot advanced mutation toxin into people they're dead already so this should not be too unbalanced, plus it's pretty expensive)
Also added a recipe for the mulligan toxin, with human mutation toxin + mutagen.
2016-10-03 13:24:23 +13:00
28fd0b0f55
Races with NOHUNGER won't vomit ( #20711 )
...
* NOHUNGER means no vomit
* Whoops
* Double whoops
* fixed
* That is easier actually
* Missed a tab
* Make it right
2016-10-02 14:15:19 +02:00
678759f6d4
Fixes minor stat runtime ( #20753 )
2016-10-02 00:08:47 -05:00
05cd2245eb
holladolla bill
2016-10-02 05:53:09 +03:00
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
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
00d0524278
Line ending memes nearly doomed us
2016-09-30 13:39:24 -04:00
5eacff1038
Merge branch 'master' of https://github.com/tgstation/-tg-station into hold_it
...
# Conflicts:
# code/modules/clothing/under/ties.dm
2016-09-30 13:00:49 -04:00
e43b06f750
Merge pull request #20591 from ChangelingRain/proofofconceptantagdatum
...
"Working Datum Antagonists"
2016-09-29 13:33:59 -05:00
9b0ead55aa
Merge pull request #20740 from optimumtact/proximityfixes
...
Make sure some proximity system items clean up when destroyed
2016-09-29 13:27:39 -05:00
1b81f13ad2
Merge pull request #20652 from ChangelingRain/flashthyself
...
EMPing a flash will now only flash the person holding it
2016-09-29 12:55:12 -05:00
1e92582bdd
Merge pull request #20698 from ChangelingRain/imtransandthisisapresenttoyall
...
Adds some pronoun helpers
2016-09-29 12:41:27 -05:00
dafccd0f1a
Merge pull request #20726 from phil235/PreliminaryDamageRefactor
...
Some preliminary changes before the damage refactor PR.
2016-09-29 10:07:51 -04:00
4c05d432a1
some fixes.
2016-09-29 15:58:19 +02:00
b6e79d25a4
Merge pull request #20713 from ChangelingRain/joancrushesbadgrammar
...
Fixes the proto-kinetic crusher's attack verb tenses
2016-09-29 10:44:42 +02:00
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
aaefef46b8
Merge pull request #20732 from optimumtact/justhrefthings
...
Fix multiple href exploits from incorrectly scoped locates
2016-09-28 19:00:44 -04:00
6ff0b13638
Make sure some proximity using items clean up when destroyed
2016-09-28 22:19:59 +00:00
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
105c88ea43
powercreeps the powercrepe ( #20687 )
...
It wasn't worth sacrificing the sabre for the crepe, and now it is. You sacrifice dismemberment chance for higher force and not having a sprite. Makes it more like the sabre from which it came.
Slather it up!
2016-09-29 10:07:47 +13:00
29830a9224
Sprite and Code tweaks
2016-09-28 11:21:02 -04:00
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
e47daebe29
removes the process() requirement.
...
I wonder if remie calls me out on this stuff more than most people because she knows I'll actually fix it.
2016-09-28 02:16:41 -04:00
4a56709cc8
finishes the job (thanks WJ)
2016-09-27 22:04:46 -04:00
011ff9c07f
5 commits later
2016-09-28 02:16:53 +01:00
0ad1289f7a
aaaaaaaaaaaaaaaaaaaaaaaaaaaa
2016-09-28 02:03:51 +01:00
520fa0c02d
adds in nanites in a less ridiculous form
2016-09-28 01:56:22 +01:00
83eef6662b
ties the lawyer speech bubble to the attorney's badge so lawyers can disguise and people can disguise as lawyers
...
additional badges are found in the law closet
Needs an icon
2016-09-27 19:59:23 -04:00
4fb739bc7c
changes tricord from 15u to 20u
2016-09-27 23:11:44 +01:00
0d76c2812d
Makes the survival medipen an actual SURVIVAL medipen
2016-09-27 22:34:52 +01:00
e3ce14d8fc
Fix an incorrect call to addtimer ( #20691 )
2016-09-27 15:59:35 -05:00
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
ca492ebcdb
Merge pull request #20689 from KorPhaeron/shielded
...
Shielded Hardsuit Fix
2016-09-28 09:54:15 +13:00
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
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
93bf7d13c2
Merge pull request #20659 from uraniummeltdown/fasterstockparts
...
Stock parts now build 5x faster
2016-09-28 09:50:11 +13:00
20af3ea260
some derps
2016-09-27 22:49:27 +02:00
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
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
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
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
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
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
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
4033224bdb
Fixes the proto-kinetic crusher's attack verb tenses
2016-09-27 10:12:51 -04:00
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
0b8dc7b0ae
Merge pull request #20683 from ChangelingRain/alloutofbubblegum
...
Slight bubblegum adjustments
2016-09-27 13:47:20 +02:00
Cheridan
Joan Lung
Shadowlight213
XDTM
AnturK
militaires
Incoming5643
Incoming
phil235
oranges
NikNakFlak
Akke
TrustyGun
Supermichael777
Iamgoofball
phil235
Razharas