Commit Graph

2537 Commits

Author SHA1 Message Date
Pigeons
3e27e0562b Adds sake 2018-04-28 22:16:53 -04: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
ecd0d8b538 Merge pull request #37476 from AnturK/thisalwaysbuggedme
Uppercases slot defines.
2018-04-28 13:13:56 +12: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
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
Armhulen
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
Jordan Brown
405537d7f9 Merge pull request #37365 from DaxDupont/fueltank-logging
Improves fuel tank explosion logging
2018-04-23 10:41:04 -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
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
Dax Dupont
7e11ec6bbe Improves fuel tank explosion logging 2018-04-22 17:29:23 +02:00
vuonojenmustaturska
3b27a1c35d zoinks 2018-04-14 10:57:26 -05:00
Dax Dupont
3efe335958 Liver fixes (#37175)
* Rebalances lethality and adds a traitcheck

* Moves borg reagent to other_reagents since these shouldn't do damage at all and are hardly toxins

* Lower it more because this is probably gonna hurt a lot real fast

* Naku's suggestion

derp

Thanks cobby

readds this check

almost nerfed cybernetic livers oops

Aaaaaa
2018-04-13 20:39:47 +03:00
Dax Dupont
f2846f6f0a Fixes SCP 194 not using the amount variable. 2018-04-13 09:04:25 -05:00
kevinz000
ab993a117a Component Storage, Experimental attack_hand and [ui_]interact() refactors (#36696) 2018-04-12 14:46:14 +03:00
Jordan Brown
a80d9a24cc Merge pull request #37000 from tgstation/KorPhaeron-patch-2
Update compile options to make 512 support official
2018-04-11 16:12:27 -04:00
vuonojenmustaturska
8addcd5217 remove 512 version checks 2018-04-11 14:26:22 -05:00
Tad Hardesty
80570931d1 Fix various macro consistency problems (#37092) 2018-04-11 13:20:57 +03:00
Ashe Higgs
7e4da575d5 New drink sprites for grasshopper, stinger, secs (#37004) 2018-04-08 20:27:07 -04: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
SailorDave
76abfb02b0 Tweaks mixed blood samples to preserve cloneable if the samples are the same (#36961) 2018-04-06 02:54:29 -04:00
Emmett Gaines
49d1e9ee66 Shuttles have additional baseturfs, and other minor baseturf changes (#36388)
cl ninjanomnom
fix: Shuttles have proper baseturfs now.
fix: Mineral walls properly use their baseturfs when destroyed/drilled.
add: A new engineering goggle mode allows you to see the shuttle area you're standing in.
admin: Buildmode works a bit better with baseturfs now and can properly only remove the top layer of turfs when editing. Note that as a result the order you place turfs is important and a wall placed on space means when the wall is removed there will be space underneath.
/cl

This adds an area hook for turfs getting the PlaceOnTop proc called so shuttle areas are able to intercept it and add a special turf used for determining where the bottom of the shuttle is. I'm not too certain on this being the best way to handle it but the alternatives restrict the kind of turfs that are allowed to be on shuttles which I didn't want to do as it was part of the whole intent of the baseturf change to allow any turf type on shuttles.

The alternative to the area hook would require a tool which attaches turfs to a shuttle which is why there's a shuttle area viewing tool in this pr. I considered doing it this way first but decided it was too clunky.

In addition to other changes:

Tiled/Reinforced floors have proper baseturfs now.

A large amount of the remaining ChangeTurf calls were swapped over to various baseturf helpers so, for example, mining doesn't create a lavaland turf if somehow the mineral wall is on plating.

Escape pods, the aux base, and syndicate drop pod have been converted over to shuttle templates as well.

The error when the timid var is set incorrectly has been changed to a stack_trace.

The change turf file has been made all lowercase as per standard.
2018-04-05 11:13:20 +12:00
Jordan Brown
3147e4bb27 Fixes chem macros with trailing ; 2018-04-04 09:05:28 -05:00
XDTM
8548bd88b0 Adds mob biotypes, categories that can be used to only affect certain mob types (#36570)
* Adds mob biotypes, categories that can be used to only affect certain mob types

* good boy travis

* Update syndicate.dm
2018-04-04 11:09:26 +12:00
YPOQ
1226afde9f Fixes mannitol not curing minor brain traumas (#36645)
* Fixes mannitol not curing brain traumas

* Makes has_trauma_type random, adds type arg to cure_trauma_type

* Adds get_traumas_type proc

* Default to /datum/brain_trauma
2018-04-03 12:41:17 +03:00
kevinz000
d804e3af61 GC fixes 1 (#36705) 2018-04-03 08:54:32 +02:00
AnturK
5ad59da350 Prefixes apply_effect flags, fixes unconcious define conflict 2018-03-31 16:31:11 +02:00
Jordan Brown
565a9dcc8c Merge pull request #36770 from ShizCalev/chem-dispenser-fix
Fixes chem dispenser icon desync
2018-03-30 12:26:13 -04:00
Jordan Brown
095b521231 Merge pull request #36803 from ShizCalev/chem-dispenser-exploit-fix
[s] Fixes chem dispenser not actually requiring power
2018-03-30 11:59:19 -04:00
Jordan Brown
db6bf0d8fe Merge pull request #36805 from ShizCalev/chemmaster-power-change-cleanup
Cleans up duplicate chem_master power_change() proc
2018-03-30 11:58:57 -04:00
ShizCalev
603db53fc2 Fixes silicons unable to remotely use chemmaster 2018-03-30 07:34:43 -05:00
ShizCalev
fb15c169a0 Fixes chem dispenser not actually requiring power 2018-03-29 12:45:52 -04:00
ShizCalev
19b323bfad Cleans up duplicate chem_master power_change() proc 2018-03-29 12:42:41 -04:00
ShizCalev
373dad1881 Fixes chem dispenser icon desync 2018-03-29 11:27:50 -04:00
vuonojenmustaturska
20fd603f5e Makes chem dispenser recharging far less glacial (#36700)
* meme

* Makes chem dispenser recharging far less glacial

* Update chem_dispenser.dm
2018-03-28 08:00:22 -05:00
vuonojenmustaturska
9fb62af5c7 Merge pull request #36731 from fludd12/this-took-too-long-to-fix
Fixes Rainbow Extracts
2018-03-27 23:21:49 +03:00
fludd12
8637339bbf Nutriment can get you fat again. 2018-03-27 14:30:32 -05:00
fludd12
4a7169ec03 get_smurf 2018-03-27 14:18:46 -04:00
MrDoomBringer
7ebbf9af00 New Chem master sprite (#36727)
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* all you ever do is complain

* whups forgot a pixel there
2018-03-26 22:26:40 -04:00
kevinz000
e2a7094776 Fixes wet floor scaling (#36697)
* Fixes wet floor scaling

* Meh lets not
2018-03-26 18:48:50 +03:00
fludd12
663320f2d6 Fixes Rainbow Extracts 2018-03-26 00:32:34 -04:00
KorPhaeron
52a6b25c56 Removes random comment (#36619) 2018-03-23 09:10:22 -04:00
kevinz000
4a23703622 Combat Overhaul Staging: Limb Specific Stamina and status effect clickdelay modifiers! (#36274) 2018-03-23 12:36:35 +01:00
kevinz000
f300a5c155 Interaction/Attack Hand Refactor (#36405) 2018-03-23 11:20:54 +01:00
GLACoding
49d5465438 adds cell = null to deconstruct (#36589) 2018-03-22 00:29:44 -04:00
Qustinnus
81524f3ce6 fixes "Blob gas tastes of "slime and errors"" (#36582)
* fix

* bad taste descriptions

* done

* ff
2018-03-21 23:00:49 -04:00
fludd12
97534f2ac3 [Ready] Slime Crossbreeding! (Part 1 of 2!) (#35986)
* Slime Crossbreeding!

* Shifts a few things around.

* Prismatic extracts!

* Self-sustaining extracts!

* Consuming extracts!

* Recurring extracts!

* Whups!

* Regenerative extracts!

* Stabilized (unfinished)

* More stabilized!

* This took more effort than it should have.

* Industrial extracts!

* Icons!

* Colors the crosses.

* Bugfixes galore!

* Burning extracts!

* Sounds!

* Starts on burning extracts.

* Charged extracts!

* Minor adjustments to the adamantine shield.

* Fixes map! Ready!

* Fixes problem children, changes consuming extracts

* I'm an idiot.

* Fixes playsounds, unnecessary srcs.

* Removes a gross text2path

* Resolves a conflict

* More AnturK fixes.

* Fixes two other things, too.

* Burning black extracts use shapeshifting now.

* Love Potion now mostly RP in use, aligns user factions.

* Iterative discovery of status effects.
2018-03-21 21:04:26 +01:00
BunnyBot 5000
a6e1c557b5 Add Fringe Weaver, Sugar Rush, Crevice Spike drinks from Va-11 Hall-A (#36549)
* Add Fringe Weaver, Sugar Rush, Crevice Spike from Va-11 Hall-A

* Rebalance crevice spike damage

* Crevice Spike cleanup and sugar-y Sugar Rush
2018-03-21 16:19:00 +13:00
vuonojenmustaturska
287ee756e8 Adds two new intermediate beaker types to chemistry (#36484)
* a commit

* rebase

* 180
2018-03-19 20:22:32 -04:00
Anonmare
3ce8f6efea Update medicine_reagents.dm 2018-03-19 15:46:08 -05:00