Commit Graph

42767 Commits

Author SHA1 Message Date
AnturK 346819e30c Readds missing nuked narsie cinematic. (#37584) 2018-05-01 12:04:55 -04:00
Jordan Brown 6ff57368b0 Merge pull request #37516 from XDTM/LinearBrainDamage
Changes the trauma formula so constant small ticks don't keep triggering traumas
2018-05-01 10:56:18 -04:00
Tad Hardesty e268d6fe52 Fix placing boxes in storage implants (#37579) 2018-05-01 08:29:41 -04:00
XDTM e733e139c5 fix 2018-05-01 12:23:20 +02:00
Jordan Brown 40fbd57c85 Merge pull request #37593 from optimumtact/revertarmshit
Revert "fixes a pacifism kill through crushing firelocks! (#37511)"
2018-04-30 22:20:52 -04:00
Jordan Brown ad686aadd9 Merge pull request #37561 from AnturK/customloadingfix
Fixes loading custom aways.
2018-04-30 22:19:59 -04:00
Jordan Brown 61ed68053a Merge pull request #37560 from AutomaticFrenzy/patch/terminate-maintenace-protocols
Fix mecha maintenance protocol button always saying Initiate
2018-04-30 22:19:45 -04:00
Jordan Brown f91f5bb08f Merge pull request #37562 from AutomaticFrenzy/patch/corpse-runtimes
Fix runtimes in corpse code due to mob_spawners becoming null
2018-04-30 22:19:26 -04:00
Jordan Brown 8ce7d19c9c Merge pull request #37565 from ninjanomnom/component-limbo
Modifies component transfer to make ChangeTurf able to transfer components
2018-04-30 22:16:47 -04:00
Jordan Brown d132f97061 Merge pull request #37568 from pigeonsk/removeenruranium
Removes enriched uranium
2018-04-30 22:16:02 -04:00
Jordan Brown 748d9a9233 Merge pull request #37572 from deathride58/fixesdepression
Fixes the intergalactic stock market crash by removing the speculation/performance modifier
2018-04-30 22:14:51 -04:00
oranges 9465eb5130 Revert "fixes a pacifism kill through crushing firelocks! (#37511)"
This reverts commit 41eb3276fb.
2018-04-30 22:02:50 +00:00
ninjanomnom ff856e4bf5 Proper method fixes 2018-04-30 15:54:59 -04:00
Alomga f3840f8715 Makes dizziness work again 2018-04-30 14:38:37 -04:00
Jordan Brown 0ebc0d81b2 Merge pull request #37510 from JJRcop/throw_myself
Circuits can't throw themselves
2018-04-30 14:05:01 -04:00
Jordan Brown 32f2f07e4d Merge pull request #37513 from ShizCalev/pineapple-memes
Adds traits for a character's preference towards pineapples.
2018-04-30 14:02:59 -04:00
Jordan Brown 2a2ad8fd79 Merge pull request #37549 from ShizCalev/bounce_away-fixes
Resolved var name conflict for bounce_away()
2018-04-30 13:52:52 -04:00
Jordan Brown 0fc0625ed2 Merge pull request #37539 from pigeonsk/sakememe
Ports sake with new sprites
2018-04-30 13:49:51 -04:00
Jordan Brown d4091e606c Merge pull request #37556 from 81Denton/techweb-sunglasses
More holosigns for techwebs
2018-04-30 13:48:23 -04:00
Jordan Brown 7e3b4e47a3 Merge pull request #37554 from DaxDupont/vents
Adds some more reagents to clogged vents
2018-04-30 13:47:37 -04:00
vuonojenmustaturska aec59e6c62 Merge pull request #37577 from kevinz000/patch-495
Removes a duplicate comsig I accidently added
2018-04-30 17:33:25 +03:00
deathride58 336259d58b i give up - removes the speculation/performance modifier instead. 2018-04-30 10:32:58 -04:00
Pigeons f879167156 Adds sake to boozeomat 2018-04-30 07:17:01 -04:00
Jalleo 5d2db204bc [s] Small tweaks and fixes a edgecase with machine construction (#37494)
* Puts back required time for the emitter and field_generator and also removes a certain issue that certain people were causing

* Couple of things I missed

* I noticed the error with regards to atom and changed to obj like I was trying to originally. Also its fine to build on tables that wasnt the issue with this specific aspect.

* Edge windows. We need those.

* optimised the checks to be behind a if check for when you are actually needing to make something for the floor...

* Corrects a input proc by request

* Working is not my strong suit.
2018-04-30 13:01:43 +03:00
ShizCalev d86c2818a5 Removed /obj/item/asteroid path (#37500)
* Cleans up some item paths

* removed kebab
2018-04-30 12:57:36 +03:00
vuonojenmustaturska 6f10c97329 Merge pull request #37499 from ShizCalev/bikehorn-fix
Fixes bikehorn mood event
2018-04-30 12:57:05 +03:00
kevinz000 dc60377444 Fixes circuits being able to detect ghosts and fix pinless guns (#37437)
* Circuit exploit fixes

* Update input.dm
2018-04-30 12:56:18 +03:00
kevinz000 f31c01cecb beam rifle delay (#37544) 2018-04-30 12:54:25 +03:00
Fox McCloud 6cbf4483ee Fixes Blast Cannon (#37503)
* Fixes Blast Cannon

* no magic numbers

* tweak
2018-04-30 12:53:59 +03:00
ShizCalev 65ebea8413 [s] Fixes the fryer shrinking the size of objects (#37489)
* Fixes the fryer shrinking the size of objects

* few more vars
2018-04-30 12:52:46 +03:00
ShizCalev b0387b17da Fixes glass stack explosion act (#37498) 2018-04-30 12:52:11 +03:00
Denton 82cf848456 removes HUDsunglasses from the premises 2018-04-30 09:46:08 +02:00
Evsey Antonovich c031e666b3 IC weapons only works on turfs (#37496) 2018-04-30 02:32:34 -04:00
kevinz000 c044cc33c4 Removes excess signal 2018-04-29 23:27:57 -07:00
Dax Dupont 8adbe2ed8e Adds a cooldown to PDA send to all messages. (#37422)
* Adds a cooldown to PDA send to all messages.

* aaa

aaa

* forgot this one

* condom
2018-04-30 02:09:10 -04:00
ShizCalev ac2967fa66 Moved to vars 2018-04-30 01:20:37 -04:00
Mickyan ed3a11e2b8 Makes nutrition level show up on self-inspect (#37509)
* Makes nutrition level shows up on self-inspect

* Changed to switch statement, edited flavor text
2018-04-30 01:19:20 -04:00
george99g f28092423a Deactivate suicide prescans via ghost var (#36839)
* Create suicide_log proc in /mob/living

Suicide logging moved to there.

* Stop after-suicide prescan clones
2018-04-30 14:35:00 +12:00
deathride58 8e63755bdb fixes the intergalactic stock market crash 2018-04-29 22:13:27 -04:00
Pigeons cc1391fc68 Removes enriched uranium 2018-04-29 20:26:58 -04:00
pigeons 96e384448c Actually links mineral sprites with their new location (#37564)
Fixes sprites being broken
2018-04-30 12:07:47 +12:00
ninjanomnom c1e5150681 Purge references in /storage/concrete Destroy 2018-04-29 19:13:18 -04:00
erwgd d988406583 added fly and moth categories to limb grower and limbgrower_designs.dm (#37349)
only human and lizard synthetic limbs will have should_draw_greyscale set to true

added /improper and uncapitalised synthetic limb names

removed plasmaman parts from human_parts_greyscale.dmi
2018-04-30 10:53:42 +12:00
vuonojenmustaturska 3eb30b16f3 Replaces HEALS_EARS_2 with a component, adds a wearertargeting parent component for future use (#37530)
code: HEALS_EARS_2 is removed in favor of the earhealing component

code: wearertargeting component is available to subtype for components that want to target the wearer of an item rather than the item itself
2018-04-30 10:32:59 +12:00
vuonojenmustaturska ccf8fc5bc5 Kills off three more flags from flags_2 (#37529)
code: More flags have been moved to their appropriate places
SLOWS_WHILE_IN_HAND
FROZEN
NO_MAT_REDEMPTION

all moved to item_flags
2018-04-30 10:32:23 +12:00
oranges d9f9368c1d Merge pull request #37535 from cyclowns/fusion-fix
Fixes gas fusion power not being taken into account
2018-04-30 10:20:01 +12:00
ninjanomnom 5028239b35 Modifies the component transfer to make ChangeTurf work 2018-04-29 18:11:02 -04:00
Tad Hardesty 9f0f3bd32c Fix runtimes in corpse code due to mob_spawners becoming null 2018-04-29 13:59:41 -07:00
AnturK 581166612b Fixes loading custom aways. 2018-04-29 22:50:51 +02:00
kevinz000 1383b34a7b [syou can no longer insert a storage object into itself, and therefore, no longer bohbomb with one boh (#37410)
* paradox

* fine, byond.

* src.
2018-04-29 16:22:33 -04:00