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
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
oranges
85346cd5e4
Merge pull request #37497 from ExcessiveUseOfCobblestone/patch-42
...
Replaces a / with * as per Contributing.md [bscrystal.dm]
2018-04-28 14:20:58 +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
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
Grandmother of 50
14f26a1707
Replaces a / with * as per Contributing.md
2018-04-27 15:29:25 -04:00
Dax Dupont
354f843132
Adds logging for PDA explosions ( #37465 )
...
* Adds logging for PDA explosions
* Adds antag status
2018-04-27 21:10:23 +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
MrDoomBringer
5ec8a18c74
Analyzers show temperature in Kelvin as well as Celsius now ( #37441 )
...
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089 )
* wew
* nicbn
2018-04-27 03:27:13 -04:00
Jordan Brown
cefaaff369
Merge pull request #37407 from Fox-McCloud/circuits-reagents
...
Removes Acid from Remaining Circuits
2018-04-26 16:23:31 -04:00
81Denton
849adf62d3
adds grind_results to coins and diamonds ( #37403 )
2018-04-25 07:04:06 -04:00
Dax Dupont
0de35f88bc
Makes radiation collectors buildable ( #37363 )
...
* Makes radiation collectors buildable
* capitalism at it's finest
* a
2018-04-24 08:13:13 -04:00
Fox McCloud
3545973181
Removes Acid from Remaining Circuits
2018-04-24 05:34:17 -04:00
Jordan Brown
0a28a839cf
Merge pull request #37364 from Jalleo/Inducer_change
...
Removes the ability for inducers and circuits to charge energy weapons.
2018-04-23 09:49:03 -04:00
Jordan Brown
4fca080a0f
Merge pull request #37381 from DaxDupont/toolbelts
...
Fixes toolbelts holding everything
2018-04-23 09:30:25 -04:00
Fox McCloud
057aa31cda
Kills off /obj/item/device ( #37297 )
...
* Kills off /obj/item/device
* whoops
* whoops
* Fix
2018-04-23 15:00:23 +02:00
Dax Dupont
399de6b59c
aww yee
2018-04-23 13:47:27 +02:00
Dax Dupont
85b1b99f35
Fixes toolbelts holding everything
2018-04-23 13:33:51 +02:00
iksyp
28e98a4d40
Gives beer and soda dispensers their own circuitboards and Design ID's ( #37315 )
...
* new boards
* new boards installed
* new designs (wow) (woah)
* added the new design ids to the biotech node
* tested
it works, also, that typo fucking stopped it from compiling
2018-04-22 20:20:06 -04:00
blah
0042b12379
What I get for commiting without doing a build check first
2018-04-22 14:09:09 +01:00
blah
97b52ed3d7
Fixes a power creep that occurred with two objects that weren't realised by the project lead/owner and needs reverting.
2018-04-22 14:02:27 +01:00
pigeons
6135ec864f
Refactors bitflag macro values into bitshifts ( #37234 )
...
* Refactors bitflag values into bitshifts
* minor formatting edits
* Unbitshifts a macro set that skipped 3 for whatever reason
2018-04-19 18:36:35 -04:00
vuonojenmustaturska
84c9c95c52
Makes welding tools (attempt to) flash you during progress ( #37222 )
...
* There's no such thing as a free weld
* future proofing
2018-04-16 20:21:28 -04:00
PKPenguin321
02f9740696
Esword cig lighting messages fix ( #37216 )
...
* fix esword cig lighting message
`Jeb Ray swings their the energy sword. They light the cigarette in the process.` becomes `Jeb Ray swings their energy sword. They light their cigarette in the process.`
* fix desword cig lighting message
`Jeb Ray swings his the double-bladed energy sword (Wielded). he lights the cigarette in the process.` becomes `Jeb Ray swings their double-bladed energy sword (Wielded). They light their cigarette in the process.`
* check fix
* desword check fix
* suggested message replacement
* suggested message change desword
2018-04-16 20:19:42 -04:00
Dax Dupont
efd69243e4
Fixes granters breaking on interrupt in final stage. ( #37235 )
...
* Fixes granters breaking when interrupted in the final phase.
* Missed one
2018-04-16 10:35:15 -05:00
AnturK
e1d9283c09
Fixes some defines. ( #37223 )
2018-04-16 16:32:05 +03:00
Grandmother of 50
d45a54348a
Repeat of "I don't recall an arcade machine being th... GLORF (Chameleon Projector Change)" ( #37141 )
...
* Update chameleonproj.dm
* Pseudo Lings need not apply
* Update chameleonproj.dm
* Update chameleonproj.dm
2018-04-16 05:39:21 -04:00
John Ginnane
d434cac5b7
Sender of PDA messages is told when their message is sent ( #37055 )
...
* Adds "sent message" to the sender of PDA messages
* Added span to message
2018-04-14 17:13:52 -04:00
AnturK
66d9a4a0cf
Removes /related area variable. ( #37173 )
...
* Removes /related area variable.
* area_contents begone
* doorstuff
2018-04-14 12:45:00 +03:00
ShizCalev
8476e6e55e
Fixes bad span class for cham projector warning ( #37140 )
2018-04-13 15:50:16 +03:00
kevinz000
ab993a117a
Component Storage, Experimental attack_hand and [ui_]interact() refactors ( #36696 )
2018-04-12 14:46:14 +03:00
Dennok
a3a439a073
RPD pipe autowrenching ( #36417 )
...
* RPD autowrenching
* up
add toggle, remove auto unwrenching
2018-04-12 09:35:55 +12:00
Tad Hardesty
80570931d1
Fix various macro consistency problems ( #37092 )
2018-04-11 13:20:57 +03:00
iksyp
910eb893b9
The supermatter crystal is now the parent object of the supermatter shard, rather than the other way around ( #37025 )
...
*every mention of /obj/item/machinery/power/supermatter_shard in the code should have been replaced with /obj/item/machinery/power/supermatter_crystal and it's variants.
*supermatter shard has been moved to /obj/item/machinery/power/supermatter_crystal/shard
*variable changes like gasefficiency and explosion_power has been switcharood in order to keep it in line with the game as of now
2018-04-11 22:18:49 +12:00
vuonojenmustaturska
ece7de4fb2
Admin borg panel ( #36990 )
...
* borgpanel
* wip borg upgrades
* some more
* lockdown
* Update borgopanel.ract
* Update borgopanel.ract
* Update borgpanel.dm
* fuggin borg upgrades :DDD
* more compile, less whatever
* meaningless churn
* and we're done
* usr, vtec
* Update borgopanel.ract
* Update borgpanel.dm
* many squid are cool
* reviews
* coerce to client, much nicer this way
* add admin logging
* review stuff
2018-04-08 11:46:27 -04:00
Tlaltecuhtli
34127e9f8d
fixes #34388 by adding cam ( #36627 )
...
* wip fixes #34388
🆑
fix:stuff
🆑
* vv
* ASDASD
* daikshu
* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
* 99999999999999999999999999999
* *tabs*
* Update comp_board_designs.dm
2018-04-06 10:25:59 -04:00
Davidj361
e5d407a1a9
Added cancel button ( #36953 )
2018-04-06 11:48:02 +03:00
John Ginnane
ff20954971
Fixed sometimes using items on full storage items ( #36711 )
...
* Fixed sometimes using items on full storage items
* Removed redundant code and fixed spray being used on container
2018-04-04 11:02:44 +12:00
iksyp
473e18607f
implant_loyality.dm has been changed to implant_mindshield.dm, better reflecting it's contents and removing a typo ( #36855 )
...
* loyality
*fixed a bug that made coding relating to loyalty implants basically impossible
* did i say loyalty i meant mindshield
* and the .dme as well
this commit and last were webeditor but it should work
2018-04-02 20:45:03 -04:00
vuonojenmustaturska
27143495c6
Merge pull request #36851 from 81Denton/bs-polycrystal-name
...
Adds singular_name to BS polycrystals
2018-04-01 15:27:35 +03:00
Jordan Brown
a7f92ae3d9
Merge pull request #36863 from AnturK/unconciousdefine
...
Prefixes apply_effect flags, fixes unconcious define conflict
2018-04-01 01:15:35 -04:00
AnturK
5ad59da350
Prefixes apply_effect flags, fixes unconcious define conflict
2018-03-31 16:31:11 +02:00
Denton
ea19d80cf5
singular_name
2018-03-31 10:37:08 +02:00
vuonojenmustaturska
28f3a3e354
honk2: electric boogaloo
2018-03-29 22:47:56 +03:00
vuonojenmustaturska
53089a50d1
Fixes chameleon projector memes
2018-03-29 20:50:55 +03:00
