Commit Graph

475 Commits

Author SHA1 Message Date
iksyp
e8698ab798 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 19:19:51 -05:00
vuonojenmustaturska
26fb305551 zoinks 2018-04-14 10:57:55 -05:00
Dax Dupont
b56b2a94e8 Fixes SCP 194 not using the amount variable. 2018-04-13 09:03:40 -05:00
vuonojenmustaturska
d559fc1bd3 remove 512 version checks 2018-04-11 14:26:41 -05:00
deathride58
e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
Ashe Higgs
682db30746 Adds new drink sprites for Stinger, Grasshopper, and Quadruple/Quintuple Sec by Mickyan 2018-04-08 19:26:38 -05:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
SailorDave
107ccfda10 Tweaks mixed blood samples to preserve cloneable if the samples are the same (#36961) 2018-04-06 01:54:15 -05:00
deathride58
cd251d79b2 Merge pull request #6264 from Citadel-Station-13/upstream-merge-36645
[MIRROR] Fixes mannitol not curing minor brain traumas
2018-04-04 21:11:28 +00:00
Jordan Brown
057d10f654 Fixes chem macros with trailing ; 2018-04-04 09:04:53 -05:00
YPOQ
1ee5b349d7 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 22:03:20 -05:00
LetterJay
9bb405d27c Merge pull request #6147 from Citadel-Station-13/upstream-merge-36738
[MIRROR] Nutriment can get you fat again.
2018-04-01 17:40:38 -05:00
LetterJay
88f328651f Update food_reagents.dm 2018-04-01 04:39:21 -05:00
LetterJay
38a1a0fca7 Merge pull request #6198 from Citadel-Station-13/upstream-merge-36804
[MIRROR] Fixes silicons being unable to remotely use chemmaster functions
2018-03-31 19:03:13 -05:00
LetterJay
dfc437a00f Merge pull request #6196 from Citadel-Station-13/upstream-merge-36805
[MIRROR] Cleans up duplicate chem_master power_change() proc
2018-03-31 18:44:25 -05:00
LetterJay
df8f936cf8 Merge pull request #6195 from Citadel-Station-13/upstream-merge-36803
[MIRROR] [s] Fixes chem dispenser not actually requiring power
2018-03-31 18:44:11 -05:00
ShizCalev
d29eb299ec Fixes silicons unable to remotely use chemmaster 2018-03-31 06:18:13 -05:00
Jordan Brown
ca7f0796a2 Merge pull request #36805 from ShizCalev/chemmaster-power-change-cleanup
Cleans up duplicate chem_master power_change() proc
2018-03-31 06:17:44 -05:00
Jordan Brown
0273ee6d03 Merge pull request #36803 from ShizCalev/chem-dispenser-exploit-fix
[s] Fixes chem dispenser not actually requiring power
2018-03-31 06:17:34 -05:00
Jordan Brown
73d4e9b11c Fixes chem dispenser icon desync 2018-03-31 06:16:29 -05:00
fludd12
13593d757b Nutriment can get you fat again. 2018-03-28 12:17:06 -05:00
vuonojenmustaturska
0a63f55771 Makes chem dispenser recharging far less glacial (#36700)
* meme

* Makes chem dispenser recharging far less glacial

* Update chem_dispenser.dm
2018-03-28 12:15:24 -05:00
kevinz000
4773743eab Fixes wet floor scaling (#36697)
* Fixes wet floor scaling

* Meh lets not
2018-03-26 10:49:42 -05:00
CitadelStationBot
c618b30214 [MIRROR] Fixes cells being deleted from chem dispensers on deconstruction (#6071)
* adds cell = null to deconstruct (#36589)

* Fixes cells being deleted from chem dispensers on deconstruction
2018-03-22 06:12:28 -05:00
CitadelStationBot
b283c5f07a [MIRROR] fixes "Blob gas tastes of "slime and errors"" (#6064)
* fixes "Blob gas tastes of "slime and errors"" (#36582)

* fix

* bad taste descriptions

* done

* ff

* fixes "Blob gas tastes of "slime and errors""
2018-03-22 06:09:26 -05:00
Poojawa
b4a7def5ca Hypospray kits and reworks! (#5907)
* Adds Hypospray kits, fixes reagent overlays

Also adds colors to trek chems other than PINK.

* reee admins.txt

* adds the CMO Hypo MK II kit to the CMO's locker

renames the locker overrides as well, because lazy

* grammer gud

* hypo vial fix suggested by Kfive

* Modifies hypospray functions

* Fixed the Hypospray mk.II, is now comprehensive where it must.

* Fixed bugs, including the vending machine problem.

* Either fixed or didn't fix line terminator issues.

* Turns out there were no line ending problems, rather there were literally spaces after some lines, which got removed automatically.

* Forgot a comma.

* Forgot a comma, even though it's in a comment. Good thing I caught it before somebody tried decommenting it.

* Left a line in the alternative reskin function for hypovials. This has been removed since it's unnecessary.

* delay tweaks. otherwise all good.

* reee github

* unneeded \the I thought were purged

* grammar fix, gives MDs and Chemist hypokits

* Makes chem masters able to produce vials

* recompiles tgui

* Update belt.dm
2018-03-21 15:28:06 -05:00
CitadelStationBot
4403ccf908 [MIRROR] Add Fringe Weaver, Sugar Rush, Crevice Spike drinks from Va-11 Hall-A (#6038)
* 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

* Add Fringe Weaver, Sugar Rush, Crevice Spike drinks from Va-11 Hall-A
2018-03-21 14:00:54 -05:00
CitadelStationBot
7b3b1f65ec [MIRROR] Adds two new intermediate beaker types to chemistry (#6018)
* Adds two new intermediate beaker types to chemistry

* YAY I DON'T HAVE TO KEEP UP WITH SNOWFLAKE ANYMORE

* Update all_nodes.dm
2018-03-19 22:17:05 -05:00
CitadelStationBot
dad2d44ea2 [MIRROR] [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#5992)
* [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#36344)

cl Floyd / Qustinnus
del: Removes short-term effects of mood
add; Adds long-term effects of mood by implementing sanity which goes up with good mood, down with bad mood, but takes time to change. Your sanity can be seen as your average mood in the recent past. All effects of moods are now covered by this system
add: Beauty component, currently only attached to cleanables, but you could attach it to any atom/movable and make them pretty/ugly, affecting mood of anyone in the room.
refactor: Removes the original way of adding mood events, uses signals properly instead.
fix: Cleanables "giving" area's free beauty during initialization
fix: Fixes some events not clearing properly
/cl

Fixes #36444

From now on mood no longer affects you directly, instead it decides whether your sanity goes up or down, when your sanity gets too low you will get the effects of what mood did before.

This means getting hit with bad moods due to being attacked while not mean you are doomed anymore, and you get a large timeframe to get away and just fix your mood later.

I also added the beauty component, you could add this to any object and it would either make a room prettier or uglier, comparable to DF or Rimworld. You could add traits to make certain people ugly, for example.

* [READY] Several fixes/changes to mood, longterm mood effects, beauty component
2018-03-19 21:33:18 -05:00
CitadelStationBot
26e1aec9d8 [MIRROR] Massively slows Spaceacillin metabolism (#6005)
* Massively slows Spaceacillin metabolism

* Update medicine_reagents.dm
2018-03-19 21:06:56 -05:00
deathride58
f74aa475c1 Merge pull request #5988 from Citadel-Station-13/upstream-merge-36449
[MIRROR] Chem dispenser upgrade
2018-03-17 23:55:32 +00:00
deathride58
1fc5fe361c Merge pull request #5970 from Citadel-Station-13/upstream-merge-36393
[MIRROR] Fixes bluespace radio potions
2018-03-17 23:49:02 +00:00
vuonojenmustaturska
aceed22b76 Chem dispenser upgrade 2018-03-17 10:10:20 -05:00
oranges
e4c2aae759 Merge pull request #36393 from Polyphynx/slimeradio
Fixes bluespace radio potions
2018-03-17 07:53:37 -05:00
kevinz000
f78fea7333 [READY] Refactors wet floors to a component (#36130)
* Wet Floor components

* No more turf wet slide.
2018-03-17 07:53:11 -05:00
CitadelStationBot
0bf1f7ce14 [MIRROR] Refactors some trauma code, fixes some trauma heals not working (#5955)
* Refactors some trauma code, fixes some trauma heals not working (#36093)

* Refactors some trauma code, fixes some trauma heals not working

* that too

* fix indent

* antur comments

* Refactors some trauma code, fixes some trauma heals not working
2018-03-15 20:50:10 -05:00
CitadelStationBot
c91006c27f [MIRROR] Create ERT refactor (#5924)
* Create ERT refactor (#36321)

cl Naksu
admin: ERT creation has been refactored to allow for easier customization and deployment via templates and settings
/cl

* Create ERT refactor
2018-03-12 07:30:03 -05:00
CitadelStationBot
7273e4f142 [MIRROR] Makes space cleaner more efficient, reduces spraybottle volume (#5914)
* Makes space cleaner more efficient, reduces spraybottle volume (#36228)

* Buffs janitor by making the space cleaner spray much more efficient

* bump volume to 100, shuffle some vars around

* Makes space cleaner more efficient, reduces spraybottle volume
2018-03-12 07:06:36 -05:00
CitadelStationBot
64abde83eb [MIRROR] Cult Fixes and Minor Balance Tweaks (#5913)
* Cult Fixes and Minor Balance Tweaks (#36092)

* Fixes and Balance Tweaks

* Faster deconversions

* Shade nerf

* Cult Fixes and Minor Balance Tweaks
2018-03-12 07:01:54 -05:00
deathride58
2c34acc034 Merge pull request #5853 from Citadel-Station-13/upstream-merge-35475
[MIRROR] [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]
2018-03-09 20:36:58 +00:00
deathride58
936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05:00
Jordan Brown
7650336507 Merge pull request #36258 from vuonojenmustaturska/bepis
Makes the smoke machine deconstructable
2018-03-09 12:48:31 -06:00
deathride58
78db80026d Merge pull request #5840 from Poojawa/reverts-crybaby-inducer
Reverts crybaby inducer also does the sync things
2018-03-09 18:36:42 +00:00
deathride58
1850af961d Merge pull request #5852 from Citadel-Station-13/upstream-merge-36198
[MIRROR] Disease fixes
2018-03-08 05:58:11 +00:00
Qustinnus
a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00
vuonojenmustaturska
5cfc5f3730 Merge pull request #36198 from Cruix/disease_fixes
Disease fixes
2018-03-07 16:04:14 -06:00
MMMiracles
48eac9e8c6 Thirteen Loko is actually dangerous (#36166)
* makes thirteen loko do the stuff it warns the person about

* you sceam in terror as you use the web editor!
2018-03-07 07:15:23 -06:00
Poojawa
455ee7e687 modules 2018-03-06 21:45:16 -06:00
CitadelStationBot
a2e6253f00 [MIRROR] Disease antagonist (#5815)
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
2018-03-05 15:20:59 -06:00
CitadelStationBot
766b85908e [MIRROR] Adds the Ancient Cloning Lab ruin (#5814)
* Adds the Ancient Cloning Lab ruin

* fixes conflicts
2018-03-05 15:20:49 -06:00