Commit Graph

144 Commits

Author SHA1 Message Date
kevinz000
b291a927f7 Merge pull request #8209 from Trilbyspaceclone/anitrad
Addtion ways to deal with radiation
2019-04-06 19:14:46 -07:00
Poojawa
d8312ec5ae Medical belt overlays + hypo storage 2019-04-04 18:38:34 -05:00
Trilbyspaceclone
0bf8d345e2 Update pill.dm 2019-04-04 15:52:46 -04:00
Trilbyspaceclone
d4b9c06dd2 Update pill.dm 2019-04-04 14:59:23 -04:00
Ghommie
27efffb74c 1 2019-03-10 15:28:05 +01:00
Trilbyspaceclone
7a2088aba6 Adds usefull tools/healing items to utility lockers - Requested by LeonDuvall (#7974)
* Update utility_closets.dm

* Update firstaid.dm

* Update pill.dm

* Update hypospray.dm

* Update firstaid.dm

* Update pill.dm
2019-02-13 20:46:55 -08:00
Trilbyspaceclone
ba26c374cb [Ready] Janitor buff, they can now get a spray bottle of drying agent (#7960)
* Update spray.dm

* Update packs.dm

* Update wardrobes.dm

* >Works with cargo and lists all the time yet still forgets the comma

* Update wardrobes.dm

* Update packs.dm
2019-02-08 05:25:07 -08:00
Poojawa
35ae45e220 make it actually check for THICKMATERIAL 2018-10-13 06:54:20 -05:00
Poojawa
6268e2f143 stops patches from applying magically through suits 2018-10-13 04:45:48 -05:00
Ignari-Coldstorm
967a535aeb New Reagent, Universalizes Survival Medipen (#7570)
* New Reagent, Universalizes Survival Medipen

Adds an alternate regenerative jelly for the survival medipens used in mining. Replaces the tricord and omnizine in medipens with 15u of Neo Jelly. Makes medipens finally useful for slime miners. When ODed on Neo Jelly, causes heavy brute/burn and minor oxyloss and causes no toxin damage.

* code alter

adds * to the REM.

* additional code fix

removes the M.adjustToxLoss line, and corrects code text to 52 units injected, from 57.
2018-09-26 12:07:00 -07:00
Poojawa
99e57fb221 various citadel tweaks/fixes
remeber to add //citadel edit to base code changes because we're still a downstream and hard syncs are still a thing
2018-09-17 03:26:05 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
c8a3f56af6 Merge pull request #7489 from Citadel-Station-13/nanites
Nanites port
2018-09-03 13:47:28 -04:00
LetterJay
1b11773cd9 DB port 2018-08-23 07:20:49 -05:00
kevinz000
b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
Tupinambis
02a86dd2a0 New Alien Lavaland Ruin (#7455)
* Removes the old "xeno nest" lavaland ruin that currently is blacklisted on the live server, and replaces it with a new "alien nest" ruin.

* Tiny ruin description change.

* Removed all organs scattered around the nest, and replaced them with corpses you must harvest the organs from. Also slightly changes the loot and the locations of said loot.

Drone and Queen corpse spawners have been added.

* Removed xenomorph queen corpse, moved drone corpse into a location that is harder to cheese. Added "Hive's Blessing" (Syringe containing alien microbes.)
2018-08-23 00:26:32 -07:00
Hatterhat
72231976a7 Replaces plasma in execution syringes with amatoxin (#7360)
* Removes plasma from execution syringes

holy shit what a meme

* Replaces initropidril with amatoxin

shit man idk lmao
2018-08-03 19:30:10 -07:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
Irafas
feb01437d6 Prevents reagents being transferred to a bucket while its worn on a head (#38727)
* Fixed bucket hat bug

Stopped the user from pouring reagents into a bucket while worn as a hat. Does so by changing the bucket to not have a container type until its removed

* Should work

* Works better

* ExcessiveUseOfCobblestone is right, this better

* As per recommendation
2018-06-26 15:33:30 -05:00
Tlaltecuhtli
01eb1bc7fe [READY] better contraband crates (#38321)
feature: NT reports that the local contraband market has expanded, experts say that the Syndicate is involved.
2018-06-21 18:52:15 -05:00
CitadelStationBot
ae9c3f4b83 [MIRROR] You can see what other people eat or drink (#7101)
* You can see what other people eat or drink (#38395)

* Makes drinking message visible to others

* Makes swallow message visible to other people

* Adds visible messages for eating

* Update snacks.dm

* Update snacks.dm

* Update objs.dm

* Update drinkingglass.dm

* Update pen.dm

* Update drinkingglass.dm

* Update drinkingglass.dm

* Update drinkingglass.dm

* Update drinks.dm

* Update condiment.dm

* Update snacks.dm

* Adds a few extra reagents to the borg shaker

* Update drinkingglass.dm

* Update drinkingglass.dm

* removes blood as a borg shaker reagent

* You can see what other people eat or drink
2018-06-13 20:31:38 -07:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05: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
LetterJay
9ff3e78bbb Merge pull request #6620 from Citadel-Station-13/upstream-merge-37598
[MIRROR] Adds grenadine.
2018-05-23 22:26:44 -05:00
LetterJay
db87f3dbae Merge branch 'master' into upstream-merge-37598 2018-05-23 07:44:52 -05:00
LetterJay
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJay
e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
LetterJay
0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
LetterJay
204043bc26 Update borghydro.dm 2018-05-17 23:44:58 -05:00
ThePainkiller
e2bcf82341 Adds Fernet, a digestif that reduces your satiety. 2018-05-17 10:19:40 -05:00
ShizCalev
b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
Hyacinth-OR
4a7f656823 Adds grenadine. 2018-05-02 13:13:29 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -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
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
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
Poojawa
455ee7e687 modules 2018-03-06 21:45:16 -06:00
CitadelStationBot
58413c4b54 [MIRROR] Renames various reagent IDs to be more descriptive (#5634)
* Renames various reagent IDs to be more descriptive (#35824)

* changes chloral2/beer2 names, fixes chloral2 desc

* reverts chloral2 name/desc, renames ling adrenals

* caPITALIZATION

* Renames various reagent IDs to be more descriptive

* fixes compile issues with Travis
2018-02-24 09:35:48 -06:00
CitadelStationBot
4351621e7d [MIRROR] Enables the RPED to construct/replace beakers, igniters and bluespace crystals (#5673)
* Enables the RPED to construct/replace beakers, igniters and bluespace crystals (#35779)

* - Makes it possible to load the rped with beakers, assemblies and other such parts

* - Fixes cell ratings being not really related to desirability

* - sorry uhhh emp cells need to be slightly better than regular cells

* Enables the RPED to construct/replace beakers, igniters and bluespace crystals
2018-02-23 17:42:24 -06:00
CitadelStationBot
099157b8ff [MIRROR] Renames neurotoxin2 (the toxin, not the drink) (#5666)
* fentanyl (#35882)

* Renames neurotoxin2 (the toxin, not the drink)
2018-02-22 23:43:23 -06:00
AnturK
73928eb9c0 Fixes patches runtime when applying to missing limbs. (#35845)
* Fixes patches runtime when applying to missing limbs.

* Some feedback.
2018-02-21 11:41:51 -06:00
Jordan Brown
f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
ShizCalev
98bbfb8709 [s]Fixes writing bugs/exploits 2018-02-15 16:10:03 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
CitadelStationBot
b6c4bd6e01 [MIRROR] Fixes bloodpack sprite issues (#5333)
* Fixes bloodpack sprite issues

* Update packs.dm

* fuck this godamn map
2018-02-06 18:24:51 -06:00
Poojawa
a7f0ffb6f0 modules 2018-01-31 06:56:28 -06:00
deathride58
a539f6103a Merge pull request #5107 from Citadel-Station-13/upstream-merge-34881
[MIRROR] Adds Pax to the Peacekeeper Borg's "Peace Hypospray"
2018-01-26 15:50:38 +00:00
Jordan Brown
f2d75f1439 Merge pull request #34881 from Robustin/paxPK
Adds Pax to the Peacekeeper Borg's "Peace Hypospray"
2018-01-26 02:59:45 -06:00