453bd38ca5
Merge pull request #37516 from XDTM/LinearBrainDamage
...
Changes the trauma formula so constant small ticks don't keep triggering traumas
2018-05-01 09:56:39 -05:00
d9c368a2a4
Merge pull request #37562 from AutomaticFrenzy/patch/corpse-runtimes
...
Fix runtimes in corpse code due to mob_spawners becoming null
2018-04-30 21:19:22 -05:00
c869ad12bd
Merge pull request #37572 from deathride58/fixesdepression
...
Fixes the intergalactic stock market crash by removing the speculation/performance modifier
2018-04-30 21:14:22 -05:00
90ecbf6bb9
Makes dizziness work again
2018-04-30 13:38:12 -05:00
9c9b2feefc
Merge pull request #37510 from JJRcop/throw_myself
...
Circuits can't throw themselves
2018-04-30 13:04:19 -05:00
12eb6a8a97
Merge pull request #37513 from ShizCalev/pineapple-memes
...
Adds traits for a character's preference towards pineapples.
2018-04-30 13:02:05 -05:00
a9d452a24d
Merge pull request #37549 from ShizCalev/bounce_away-fixes
...
Resolved var name conflict for bounce_away()
2018-04-30 12:51:40 -05:00
bf0fe93f35
Merge pull request #37556 from 81Denton/techweb-sunglasses
...
More holosigns for techwebs
2018-04-30 12:48:12 -05:00
8f1bb462ad
Merge pull request #37554 from DaxDupont/vents
...
Adds some more reagents to clogged vents
2018-04-30 12:46:58 -05:00
94bebc33a0
Merge pull request #6590 from Citadel-Station-13/upstream-merge-37494
...
[MIRROR] [s] Small tweaks and fixes a edgecase with machine construction
2018-04-30 11:03:33 -05:00
34ce5380d6
Merge pull request #6589 from Citadel-Station-13/upstream-merge-37500
...
[MIRROR] Removed /obj/item/asteroid path
2018-04-30 11:03:16 -05:00
372e363257
Merge pull request #6588 from Citadel-Station-13/upstream-merge-37437
...
[MIRROR] Fixes circuits being able to detect ghosts and fix pinless guns
2018-04-30 11:02:58 -05:00
fcb1261c13
Merge pull request #6586 from Citadel-Station-13/upstream-merge-37503
...
[MIRROR] Fixes Blast Cannon
2018-04-30 11:02:16 -05:00
6885655022
Merge pull request #6585 from Citadel-Station-13/upstream-merge-37544
...
[MIRROR] Adds a 2.5 second fire delay to beam rifles
2018-04-30 10:21:06 -05:00
794d078dff
Merge pull request #6584 from Citadel-Station-13/upstream-merge-37489
...
[MIRROR] [s] Fixes the fryer shrinking the size of objects
2018-04-30 10:20:53 -05:00
b493bfe89f
Merge pull request #6582 from Citadel-Station-13/upstream-merge-37496
...
[MIRROR] IC weapon mechanism only works when assembly is on turf
2018-04-30 10:11:54 -05:00
e2ef2ee0f3
Merge pull request #6583 from Citadel-Station-13/upstream-merge-37498
...
[MIRROR] Fixes glass stack explosion act
2018-04-30 09:43:13 -05:00
987cce76ed
[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 05:00:24 -05:00
3160d7771d
Removed /obj/item/asteroid path ( #37500 )
...
* Cleans up some item paths
* removed kebab
2018-04-30 04:57:09 -05:00
7feea76eee
Fixes circuits being able to detect ghosts and fix pinless guns ( #37437 )
...
* Circuit exploit fixes
* Update input.dm
2018-04-30 04:55:55 -05:00
e2328a122e
Fixes Blast Cannon ( #37503 )
...
* Fixes Blast Cannon
* no magic numbers
* tweak
2018-04-30 04:53:32 -05:00
3ba3d5fb5e
beam rifle delay ( #37544 )
2018-04-30 04:53:21 -05:00
948f34406a
[s] Fixes the fryer shrinking the size of objects ( #37489 )
...
* Fixes the fryer shrinking the size of objects
* few more vars
2018-04-30 04:52:08 -05:00
5adabb4b91
Fixes glass stack explosion act ( #37498 )
2018-04-30 04:50:55 -05:00
6df3ffcddf
IC weapons only works on turfs ( #37496 )
2018-04-30 01:31:06 -05:00
01e4304326
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 00:17:59 -05:00
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
0a02d1cb13
Deactivate suicide prescans via ghost var
2018-04-29 21:33:56 -05:00
2ca75d7de7
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-29 17:52:44 -05:00
6f13d2c2e9
Merge pull request #6546 from Citadel-Station-13/upstream-merge-37380
...
[MIRROR] Refactors and fixes RPEDs
2018-04-29 22:45:28 +00:00
adf349db02
Update spiders.dm
2018-04-29 18:44:31 -04:00
9d33974316
Update absorb.dm
2018-04-29 18:44:14 -04:00
c075dbfe81
Update changeling_power.dm
2018-04-29 18:43:52 -04:00
e66e348d5c
Merge pull request #6572 from Citadel-Station-13/upstream-merge-37535
...
[MIRROR] Fixes gas fusion power not being taken into account
2018-04-29 22:33:37 +00:00
41e4851500
Merge pull request #6569 from Citadel-Station-13/upstream-merge-37559
...
[MIRROR] Fix grammar when cleaning things with the damp rag
2018-04-29 22:33:07 +00:00
6ae31ccf69
Merge pull request #6564 from Citadel-Station-13/upstream-merge-37514
...
[MIRROR] Fixes invisible turtleneck alt state
2018-04-29 22:30:12 +00:00
187f27983c
Merge pull request #37535 from cyclowns/fusion-fix
...
Fixes gas fusion power not being taken into account
2018-04-29 17:18:30 -05:00
ed7b8e7128
Fix grammar when cleaning things with the damp rag
2018-04-29 14:27:51 -05:00
ba4f3c0698
Makes pacifists able to use .50BMG Soporific Rounds ( #37506 )
...
* non lethal .50BMG
* no more spaghetti sauce?
I havent actually tested this
2018-04-29 10:11:42 -05:00
1478e17fea
Fixes invisible turtleneck alt state
2018-04-29 10:04:52 -05:00
c287c3a84c
Merge pull request #6548 from Citadel-Station-13/upstream-merge-37483
...
[MIRROR] Fixes obj descs and adds missing ones
2018-04-29 02:29:44 -05:00
c11c2ba70f
Merge pull request #6544 from Citadel-Station-13/upstream-merge-37479
...
[MIRROR] Fixes being unable to place a Robotic Factory if it failed to place after the prompt
2018-04-29 02:25:37 -05:00
89ffa04958
Merge pull request #6542 from Citadel-Station-13/upstream-merge-37442
...
[MIRROR] Fixes jumpToNullSpace
2018-04-29 02:24:52 -05:00
eddeff9c34
Merge pull request #6541 from Citadel-Station-13/upstream-merge-37385
...
[MIRROR] Makes clogged vents scale, and way less powerful.
2018-04-29 02:24:30 -05:00
e8fdaa1a43
Merge pull request #6539 from Citadel-Station-13/upstream-merge-37453
...
[MIRROR] set waitfor in final countdown
2018-04-29 02:21:56 -05:00
480882de58
Merge pull request #6538 from Citadel-Station-13/upstream-merge-37449
...
[MIRROR] Removes some unused code.
2018-04-29 02:21:31 -05:00
261e7fa1c1
Merge pull request #6537 from Citadel-Station-13/upstream-merge-37482
...
[MIRROR] Fixes slime pressurization potion attempting to apply multiple times
2018-04-29 02:21:07 -05:00
db142667b7
Merge pull request #37501 from ShizCalev/icon-fixes
...
Fixes missing icons
2018-04-28 14:54:45 -05:00
b565ef9171
Merge pull request #6557 from Citadel-Station-13/upstream-merge-37384
...
[MIRROR] Re-adds and reworks fusion.
2018-04-28 14:07:08 -05:00
811cc06188
Merge pull request #6536 from Citadel-Station-13/upstream-merge-37436
...
[MIRROR] Adds a stationloving component to replace a couple of flags and SSinbounds with
2018-04-28 01:36:04 -05:00
Jordan Brown