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
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
d0ae8933c0
Fix grammar when cleaning things with the damp rag
2018-04-29 14:28:52 -05:00
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
386f1ad622
Fixes invisible turtleneck alt state
2018-04-29 10:06:44 -05:00
ac55920c62
I'll get you next time, gremloids
2018-04-29 08:53:52 -05:00
4b36b9db2b
gas.dangerous -> gas.fusion_power
2018-04-28 16:29:23 -07:00
4f9006681e
Revert "You can no longer equip pet collars on humans"
...
This reverts commit 7935f2b407
2018-04-28 23:19:58 +00:00
e2f617e962
Merge branch 'pets' into upstreamunsafemaster
2018-04-28 23:18:59 +00:00
d30da792ce
Merge remote-tracking branch 'upstream/master' into pets
2018-04-28 22:58:09 +00:00
e402a6c9ac
Merge pull request #37501 from ShizCalev/icon-fixes
...
Fixes missing icons
2018-04-28 15:55:56 -04:00
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
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
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
4b455e82ca
Merge pull request #37267 from Jordie0608/iwasgoingtolaughatcitrusfordoingthisbutthenimadethesamemistake
...
Adds log and management tabs to permissions panel
2018-04-28 13:25:56 +12:00
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
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
ecd0d8b538
Merge pull request #37476 from AnturK/thisalwaysbuggedme
...
Uppercases slot defines.
2018-04-28 13:13:56 +12:00
cda6c6662c
Fixes a number of missing icons
2018-04-27 15:36:42 -04:00
f41d77063b
fixes obj descs and adds new ones ( #37483 )
2018-04-27 21:20:55 +03:00
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
ce36414842
Fixes being unable to place a Robotic Factory ( #37479 )
2018-04-27 21:11:25 +03:00
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
820dae6c33
Fixes jumpToNullSpace ( #37442 )
...
woops
2018-04-27 21:04:23 +03:00
ffa5256ee3
set waitfor in final countdown ( #37453 )
2018-04-27 21:01:52 +03:00
2219c09ac8
Removes some unused code. ( #37449 )
2018-04-27 11:32:56 -04:00
b80e9fe140
flag in flags no worky
2018-04-27 15:59:46 +03:00
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
7dab8a0bb5
Pineapples
2018-04-27 07:48:58 -04:00
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
95b2ccbaf1
BADBADBADBADBADBADBADBADBADBAD ( #37452 )
2018-04-27 12:13:37 +03:00
52a99c09d6
Uppercase slot defines
2018-04-27 10:38:32 +02:00
4c5a43eeb8
Prefix for item flag slot defines.
2018-04-27 10:30:48 +02:00
df8d58bf66
Fixes missing augmentation hands ( #37373 )
2018-04-27 03:41:56 -04:00
be0be491eb
desc ( #37435 )
2018-04-27 03:37:07 -04:00
f6e666abeb
ok! ( #37439 )
2018-04-27 03:27:41 -04:00
6e056f7791
Paperwork Error Event ( #37443 )
...
* Paperwork Error Event
* Condense the proc
* Properly calls set_overflow_role
2018-04-27 01:57:16 -04:00
58ae10ee2a
Merge pull request #37337 from ninjanomnom/buildmode-picker
...
Adds a picker tool to advanced buildmode
2018-04-26 16:26:20 -04:00
0ed16813fc
Merge pull request #37342 from ninjanomnom/vis-border
...
Makes it possible to see tiles past z transitions
2018-04-26 16:24:19 -04:00
cefaaff369
Merge pull request #37407 from Fox-McCloud/circuits-reagents
...
Removes Acid from Remaining Circuits
2018-04-26 16:23:31 -04:00
81e895678d
Makes the experimentor only output one copy of something. ( #37313 )
2018-04-26 16:01:13 +03:00
dbaeb55d33
Gives admins the D(say) hotkey + fixes buildmode permissions ( #37413 )
2018-04-25 22:39:07 -04:00
035f2a038c
Merge pull request #37416 from deathride58/fixesexponentialstockmarket
...
Fixes the stock market having random, spontaneous exponential value spikes.
2018-04-25 14:44:08 -04:00
a397688657
Fixes a thing ( #37427 )
2018-04-25 21:28:27 +03:00
ca273db3f0
Removes SCP_294 ( #37326 )
...
* aaah sweet essence
* bye bye sprites
* goodbye machine code
* bye bye blacklist entry
* whoops
* scp gone from runtime
* bye bye ract
* bye bye space ruin folder
* bye bye area
2018-04-26 03:05:41 +12:00
46861b54b3
Adds ckey to some of the ban prompts. ( #37412 )
2018-04-25 10:22:20 -04:00
849adf62d3
adds grind_results to coins and diamonds ( #37403 )
2018-04-25 07:04:06 -04:00
b5997376af
Improves messaging for blood contracts ( #37391 )
2018-04-25 06:58:48 -04:00
62c932207c
Fixes autosurgeon icon ( #37402 )
...
* Fixes autosurgeon icon
* Duh
2018-04-24 16:02:57 -05:00
5888d371ef
Merge pull request #37390 from Mickyan/snacks_contents
...
Adds salt to chips and jerky
2018-04-24 16:55:00 -04:00
vuonojenmustaturska
oranges
Tad Hardesty
iksyp
ShizCalev
cyclowns
Jordan Brown
as334
pigeons
kevinz000
PKPenguin321
81Denton
Dax Dupont
ShizCalev
Emmett Gaines
AnturK
Nich
imsxz
Armhulen
KorPhaeron