Commit Graph

20 Commits

Author SHA1 Message Date
Poojawa
5f1db72ba3 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-04-13 02:47:34 -05:00
Poojawa
60920fb449 Synthetics blood and greyscale blood effects 2019-04-06 20:05:10 -05:00
Poojawa
f6988a2a1c Adds DNA to semen puddles
Consistency's sake, I guess.
2019-04-05 18:42:22 -05:00
Ragolution
ee9368cadb why does ghomme help us
is it because he feels bad for us
real deepthink
2019-03-20 20:08:07 -04:00
Ragolution
f7807ceb73 Hmm... 2019-03-20 01:14:43 -04:00
Ragolution
0b459ad06f Fixes 200,000 runtimes during scrubber event
thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz
2019-03-20 00:35:42 -04:00
Poojawa
b00a76476c Oh hey, all of those compile fixes 2018-09-11 11:00:18 -05:00
deathride58
2808425e7f Merge branch 'master' into kevinz000-patch-2 2018-08-04 00:10:09 -04:00
deathride58
2840a3f933 Merge pull request #7416 from Citadel-Station-13/kevinz000-patch-5
halves hypospray times
2018-08-04 00:09:05 -04:00
kevinz000
7147d23c00 Update hypovial.dm 2018-07-29 17:10:33 -07:00
kevinz000
349eb64e53 Update hypovial.dm 2018-07-28 03:11:01 -07:00
kevinz000
b35ea6b472 Update hypospraymkii.dm 2018-07-28 03:09:58 -07:00
deathride58
77c2970b49 buffs the syndicate mask, makes it cost 2 tc (#7147) 2018-07-20 03:39:54 -07:00
deathride58
f986f9c9f2 makes it compile. should work. hopefully 2018-07-02 15:35:11 -04:00
deathride58
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
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
Zna12
09c840d291 Woops.
I wasn't paying enough attention, but it added a feature I wasn't intending. This smooths out the feature.
2018-03-06 22:42:02 -06:00
Zna12
1fc03bb392 Merge branch 'master' into Biodegradable-Darts 2018-03-06 21:57:23 -06:00
Zna12
05159e8029 Degradable Darts, Citadel Style
Just incase upstream doesn't want my memes.
2018-03-06 21:54:15 -06:00
Poojawa
86b11050b6 Citadel's folder's end (#5828)
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
2018-03-06 17:40:48 -06:00