Commit Graph

25078 Commits

Author SHA1 Message Date
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
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
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
Evsey Antonovich
c031e666b3 IC weapons only works on turfs (#37496) 2018-04-30 02:32:34 -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
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
Tad Hardesty
d0ae8933c0 Fix grammar when cleaning things with the damp rag 2018-04-29 14:28:52 -05:00
Dax Dupont
841a6aff93 Adds some more reagents to clogged vents 2018-04-29 18:57:10 +02:00
iksyp
870dd9edff Makes pacifists able to use .50BMG Soporific Rounds (#37506)
* non lethal .50BMG

* no more spaghetti sauce?

I havent actually tested this
2018-04-29 11:13:12 -04:00
ShizCalev
386f1ad622 Fixes invisible turtleneck alt state 2018-04-29 10:06:44 -05:00
vuonojenmustaturska
ac55920c62 I'll get you next time, gremloids 2018-04-29 08:53:52 -05:00
cyclowns
4b36b9db2b gas.dangerous -> gas.fusion_power 2018-04-28 16:29:23 -07:00
oranges
4f9006681e Revert "You can no longer equip pet collars on humans"
This reverts commit 7935f2b407.
2018-04-28 23:19:58 +00:00
oranges
e2f617e962 Merge branch 'pets' into upstreamunsafemaster 2018-04-28 23:18:59 +00:00
oranges
d30da792ce Merge remote-tracking branch 'upstream/master' into pets 2018-04-28 22:58:09 +00:00
Jordan Brown
e402a6c9ac Merge pull request #37501 from ShizCalev/icon-fixes
Fixes missing icons
2018-04-28 15:55:56 -04:00
vuonojenmustaturska
98f8ca7553 Moves several clothing-specific flags from /atom to their proper type (#37486)
* lavaproof

* more flags

* it compiles

* Remove a couple of lists
2018-04-28 13:22:28 -05:00
as334
7d32eba2a1 Re-adds and reworks fusion. (#37384)
add: Fusion is back
add: Fusion now happens with large quantities of hot plasma and CO2, consuming all the plasma rapidly and producing large amounts of energy. Other gases can also effect the performance of the reaction.
add: Fusion now produces radiation. Be careful around reactors.
fix: fixes fusion dividing by zero and destroying everything
code: Gas reactions now have access to where they are occurring
fix: Prevents some other reactions from producing matter from nothing
2018-04-28 18:01:39 +12:00
pigeons
c0b7f773dc Modified bomb and syndicate bomb spawner so Cuban Pete bombs maxcap and work again (#37293)
fix: The faint echoes of maracas grows louder, as if a past spirit once forgotten has come back with a vengeance...
2018-04-28 13:28:13 +12:00
oranges
4b455e82ca Merge pull request #37267 from Jordie0608/iwasgoingtolaughatcitrusfordoingthisbutthenimadethesamemistake
Adds log and management tabs to permissions panel
2018-04-28 13:25:56 +12:00
kevinz000
19ce08f157 More integrated circuits and NTNET upgrade! (#37165)
rscadd: Circuit ntnet components buffed. Added a new low level ntnet component that can send custom data instead of just the two plaintext and one passkey format, which things will use by default. Ntnet now uses a list for their data instead of three variables. they also have lowered complexity for the now weakened normal network component, and has lower cooldowns.
2018-04-28 13:23:44 +12:00
PKPenguin321
bcf568f98b adds new changeling var that counts actual absorbs, uses it for Spiders ability (#37081)
makes spiders power use it and lowers needed absorbs to 3 from 5

Thaw PR: #36581

I promised @improvedname I would do this in #35794 after #35394 got merged but then it died (RIP, somebody please fix it in the future).

Might make more abilities use this after I read through the forum thread that's up for lings right now
2018-04-28 13:22:08 +12:00
oranges
ecd0d8b538 Merge pull request #37476 from AnturK/thisalwaysbuggedme
Uppercases slot defines.
2018-04-28 13:13:56 +12:00
ShizCalev
cda6c6662c Fixes a number of missing icons 2018-04-27 15:36:42 -04:00
81Denton
f41d77063b fixes obj descs and adds new ones (#37483) 2018-04-27 21:20:55 +03:00
Dax Dupont
52a7ebcbff Refactors and fixes RPEDs (#37380)
* Refactors and fixes RPEDs

* Fixes storage related memes

* beams should probably always play
2018-04-27 21:12:41 +03:00
ShizCalev
ce36414842 Fixes being unable to place a Robotic Factory (#37479) 2018-04-27 21:11:25 +03:00
Dax Dupont
2cb075a85d Makes clogged vents scale, and way less powerful. (#37385)
* Makes clogged vents scale, and way less powerful.

* tweaked numbers
2018-04-27 21:04:46 +03:00
Emmett Gaines
820dae6c33 Fixes jumpToNullSpace (#37442)
woops
2018-04-27 21:04:23 +03:00
Emmett Gaines
ffa5256ee3 set waitfor in final countdown (#37453) 2018-04-27 21:01:52 +03:00
AnturK
2219c09ac8 Removes some unused code. (#37449) 2018-04-27 11:32:56 -04:00
Naksu
b80e9fe140 flag in flags no worky 2018-04-27 15:59:46 +03:00
vuonojenmustaturska
640f2cf693 Adds a stationloving component to replace a couple of flags and SSinbounds with (#37436)
* station lovin' happened so fast

* Update stationloving.dm

* less qdel memes

* imbue soul signal

* rename imbue soul signal

* dupemode

* henk

* Update atoms_movable.dm

* Update nuclearbomb.dm

* Update nuclearbomb.dm
2018-04-27 14:35:53 +02:00
ShizCalev
7dab8a0bb5 Pineapples 2018-04-27 07:48:58 -04:00
Nich
42f9248333 you can now print tools using the integrated circuit printer again (#37445)
* you can now print tools again

* I'm severely mentally retarded

* Update printer.dm
2018-04-27 06:16:57 -04:00
imsxz
95b2ccbaf1 BADBADBADBADBADBADBADBADBADBAD (#37452) 2018-04-27 12:13:37 +03:00
AnturK
52a99c09d6 Uppercase slot defines 2018-04-27 10:38:32 +02:00
AnturK
4c5a43eeb8 Prefix for item flag slot defines. 2018-04-27 10:30:48 +02:00
ShizCalev
df8d58bf66 Fixes missing augmentation hands (#37373) 2018-04-27 03:41:56 -04:00
kevinz000
be0be491eb desc (#37435) 2018-04-27 03:37:07 -04:00
Armhulen
f6e666abeb ok! (#37439) 2018-04-27 03:27:41 -04:00