Commit Graph
159 Commits
Author SHA1 Message Date
TrilbyspacecloneandGitHub 690183b14f Update chem_dispenser.dm 2019-04-11 16:08:42 -04:00
TrilbyspacecloneandGitHub be6dbd415e Update chem_dispenser.dm 2019-04-11 15:07:45 -04:00
TrilbyspacecloneandGitHub a1c8155ec8 Update chem_dispenser.dm 2019-04-02 15:42:18 -04:00
TrilbyspacecloneandGitHub de7398b1ed Update chem_dispenser.dm 2019-03-31 23:48:10 -04:00
TrilbyspacecloneandGitHub 1b1786800a Update chem_dispenser.dm 2019-03-31 20:29:07 -04:00
TrilbyspacecloneandGitHub 5883b53a87 Update chem_dispenser.dm 2019-03-31 19:33:13 -04:00
TrilbyspacecloneandGitHub b108505629 Update chem_dispenser.dm 2019-03-31 19:28:40 -04:00
deathride58andGitHub 313ec9cb6f removes rant comment to appease the hungersune 2018-11-19 10:13:09 -05:00
deathride58 9f7098231b y'all n'wahs don't even smoke weed - adds skooma (and adds the ability for reagents to define custom addiction stages) 2018-11-19 06:48:11 -05:00
Poojawa 12a9989a7c runtime fixes 2018-09-22 04:06:06 -05:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
CitadelStationBotandkevinz000 db25067491 adds missing /'s at the starts of some obj instances (#7169) 2018-06-18 11:53:33 -07:00
Dax Dupontandletterjay 899d1e2d73 Cleans up the chem synths jesus christ what the fuck 2018-06-16 15:38:22 -05:00
deathride58andGitHub e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-06-09 05:53:25 +00:00
Jordan Brownandletterjay 5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
ShizCalevandletterjay 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
deathride58andkevinz000 2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
LetterJayandGitHub db87f3dbae Merge branch 'master' into upstream-merge-37598 2018-05-23 07:44:52 -05:00
ThePainkillerandletterjay e2bcf82341 Adds Fernet, a digestif that reduces your satiety. 2018-05-17 10:19:40 -05:00
LetterJayandGitHub 3ce9fba8bf Merge pull request #6611 from Citadel-Station-13/upstream-merge-37589
[MIRROR] Adds 5 new drinks
2018-05-13 11:52:12 -05:00
81Dentonandletterjay 8463204549 Runtime: fixes RTG power, adjusts pipenet, adds debug chem dispensers 2018-05-12 18:53:59 -05:00
Hyacinth-ORandCitadelStationBot 4a7f656823 Adds grenadine. 2018-05-02 13:13:29 -05:00
europaxandCitadelStationBot 2fe4591a12 Adds 5 new drinks 2018-05-01 13:42:48 -05:00
Dax DupontandCitadelStationBot 4850230fc4 Refactors and fixes RPEDs 2018-04-27 13:13:37 -05:00
deathride58andGitHub 2ee4d3e77d Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326
[MIRROR] Removes SCP_294
2018-04-27 09:35:43 +00:00
ArmhulenandCitadelStationBot 17aa0acef8 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-25 10:05:57 -05:00
Poojawa 5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
iksypandCitadelStationBot 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
vuonojenmustaturskaandCitadelStationBot 26fb305551 zoinks 2018-04-14 10:57:55 -05:00
Dax DupontandCitadelStationBot b56b2a94e8 Fixes SCP 194 not using the amount variable. 2018-04-13 09:03:40 -05:00
vuonojenmustaturskaandCitadelStationBot d559fc1bd3 remove 512 version checks 2018-04-11 14:26:41 -05:00
Poojawaanddeathride58 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
Jordan BrownandCitadelStationBot 057d10f654 Fixes chem macros with trailing ; 2018-04-04 09:04:53 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
ShizCalevandCitadelStationBot d29eb299ec Fixes silicons unable to remotely use chemmaster 2018-03-31 06:18:13 -05:00
Jordan BrownandCitadelStationBot 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 BrownandCitadelStationBot 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 BrownandCitadelStationBot 73d4e9b11c Fixes chem dispenser icon desync 2018-03-31 06:16:29 -05:00
vuonojenmustaturskaandCitadelStationBot 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
CitadelStationBotandPoojawa 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
PoojawaandGitHub 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
vuonojenmustaturskaandCitadelStationBot aceed22b76 Chem dispenser upgrade 2018-03-17 10:10:20 -05:00
Jordan BrownandCitadelStationBot 7650336507 Merge pull request #36258 from vuonojenmustaturska/bepis
Makes the smoke machine deconstructable
2018-03-09 12:48:31 -06:00
deathride58andGitHub 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
vuonojenmustaturskaandCitadelStationBot 5cfc5f3730 Merge pull request #36198 from Cruix/disease_fixes
Disease fixes
2018-03-07 16:04:14 -06:00
Poojawa 455ee7e687 modules 2018-03-06 21:45:16 -06:00
CitadelStationBotandPoojawa a2e6253f00 [MIRROR] Disease antagonist (#5815)
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
2018-03-05 15:20:59 -06:00