Unknown
b5824871ed
Removes unnecessary check
2019-08-06 21:05:51 -04:00
Unknown
03976d3dd3
Moves var
2019-08-06 21:03:35 -04:00
Unknown
f699825119
Forgot a Var
2019-08-06 20:58:25 -04:00
Unknown
1fb88e40e2
Adds Prototype Hypospray
...
- Can be researched and manufactured by Science
- Identical to a mk1 hypospray, except does not instantly inject reagents at friendly intents
Not terribly useful right now under the current meta, but probably will be useful down the road if/when syringes become disposable again.
2019-08-06 20:54:14 -04:00
Hawk_v3
2a73ca4304
Merge remote-tracking branch 'upstream/master'
2019-07-23 22:51:24 +01:00
Atermonera
6a12033368
Merge pull request #6321 from Nalarac/patch-2
...
Allows Longer Visible Text on Beakers
2019-07-22 00:44:19 -04:00
Hawk_v3
bc7ea8379a
Merge remote-tracking branch 'upstream/master'
2019-07-02 17:54:29 +01:00
GeneriedJenelle
12df030c0a
Adds Cider Bottles ( #6201 )
...
* Adds Cider
How has SS13 alcohol gone on so long without cider? Let's fix that.
* Update cartridge_presets.dm
* Update dispenser2_energy.dm
* Update dispenser_presets.dm
* Adds cider bottle sprite + adds to borgs
* Update Chemistry-Reagents-Food-Drinks.dm
* Removes additional cider entry
2019-06-18 20:05:06 -04:00
Hawk_v3
5ec6b3294e
Merge remote-tracking branch 'upstream/master'
2019-06-18 01:26:30 +01:00
Novacat
b7205d3b60
Update pill.dm
2019-06-16 21:51:52 -04:00
Novacat
13739440c2
Grey scale pills and colored pillbottles
2019-06-16 21:28:56 -04:00
Hawk_v3
132f11f45a
Merge remote-tracking branch 'upstream/master'
2019-06-13 18:50:58 +01:00
Spades
fafd7675ef
Merge pull request #4986 from Heroman3003/zoooooooom
...
Rebalances zoom pills
2019-06-12 17:11:48 -04:00
Heroman
2de30ebaf7
Removes fertilizer aspect
2019-06-02 07:09:44 +10:00
Hawk_v3
27e73883fc
Merge remote-tracking branch 'upstream/release'
2019-05-04 21:03:48 +01:00
Unknown
eeb198d3a4
Metabolism effects
2019-05-02 19:41:17 -04:00
Unknown
fcb2830fe5
Changes adminordrazine pill
2019-05-02 19:34:35 -04:00
Unknown
68649aeb71
Recommended changes
2019-05-02 17:38:26 -04:00
Unknown
1b1489d8cc
Adds medicíne pills/bottles for adminbus
2019-05-02 17:08:39 -04:00
Hawk_v3
50e2482613
Merge remote-tracking branch 'upstream/master'
2019-04-22 20:12:14 +01:00
Novacat
aac3f800ba
Update syringes.dm
2019-04-18 13:53:34 -04:00
Novacat
8e93b70bb6
Update syringes.dm
2019-04-18 13:51:08 -04:00
Novacat
69cc49c009
Conflict Resolution
2019-04-18 13:44:38 -04:00
Atermonera
f986f56ec2
Changes way syringes interact with containers
2019-04-18 13:26:55 -04:00
Hawk_v3
41f0bd9f6d
Merge remote-tracking branch 'upstream/master'
2019-04-14 19:44:13 +01:00
Heroman
e811fec521
Rebalances zoom pills
2019-04-10 06:14:51 +10:00
Heroman
9e3aa54188
Rebalances zoom pills
2019-04-10 05:12:42 +10:00
Novacat
466516b066
Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"
2019-04-08 15:24:27 -04:00
Repede
e4dd365fe1
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
...
# Conflicts:
# code/_helpers/unsorted.dm
# code/controllers/subsystems/mapping_vr.dm
# code/datums/datum.dm
# code/datums/datumvars.dm
# code/datums/supplypacks/voidsuits.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/defib.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/world.dm
# code/modules/client/preference_setup/loadout/loadout_accessories.dm
# code/modules/client/preference_setup/loadout/loadout_eyes.dm
# code/modules/client/preference_setup/loadout/loadout_head.dm
# code/modules/client/preference_setup/loadout/loadout_suit.dm
# code/modules/client/preference_setup/loadout/loadout_uniform.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/food/food/snacks.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/reagents/Chemistry-Recipes.dm
# code/world.dm
# config/custom_items.txt
# config/example/config.txt
# config/example/game_options.txt
# icons/mob/robots.dmi
# icons/obj/mining.dmi
# maps/submaps/surface_submaps/wilderness/wilderness.dm
# vorestation.dme
2019-04-07 19:40:12 -04:00
Heroman
b11015107c
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
mistyLuminescence
5dc4686ad9
Unidentified Auto Tweak 2: Electric Boogaloo ( #5990 )
...
* Remakes #5983 by request.
2019-03-31 19:19:59 -04:00
Unknown
ad181e797a
Conflict Resolution
...
Also fixes a compiling error with previous PR
2019-03-28 17:24:03 -04:00
elgeonmb
9d056decda
Adds the Zaddat Race + Modifies pressure damage calculations
2019-03-28 16:54:32 -04:00
Unknown
ec19a66eff
Conflict Resolution
2019-03-27 16:36:41 -04:00
kevinz000
6415e4193f
[READY]Makes a bunch of processes subsystems instead
2019-03-27 16:03:51 -04:00
Neerti
585b688709
Adds Identification System, New Autoinjectors
2019-03-27 02:25:55 -04:00
Unknown
03dcb65c01
Fixes most of the issues
2019-03-27 00:38:44 -04:00
Neerti
86174593bf
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
Unknown
976aec2f71
Sorts out this PR
2019-03-26 21:43:56 -04:00
Spades
c6c7d98a2d
Merge branch 'master' into upstream-merge-5735
2019-01-14 11:20:55 -05:00
Hawk_v3
b6988c5a09
Merge remote-tracking branch 'upstream/master'
2018-12-15 19:37:28 +00:00
Unknown
b48efb138f
More merge conflict fixes
...
I think I got them all.
2018-12-13 00:33:32 -05:00
Atermonera
2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
Hawk_v3
2cfaf95e78
Merge branch 'upMaster' into updates
2018-10-21 03:48:41 +01:00
Spades
b28213c906
Merge pull request #4356 from Novacat/nova-ert
...
ERT Equipment Redo
2018-10-20 17:34:41 -04:00
Hawk_v3
71b8f6582d
Merge remote-tracking branch 'upstream/master'
2018-10-16 22:10:17 +01:00
Arokha Sieyes
ce187f64ed
Fixup other vorestation things
...
Stop using the web editor please
2018-10-16 12:05:32 -04:00
Anewbe
12e34de332
Move almost everything food related into the kitchen module.
2018-10-15 15:47:14 -04:00
Unknown
7ca817d0c8
I messed up copypasta and forgot to change iron to nutriment
2018-10-12 20:59:29 -04:00
Unknown
3f4039d027
ERT Equipment Redo
...
- Removes Light Machine Guns, Grenade Launchers, Matebas, and all 7mm battle and sniper rifles
- Adds 5mm Assault Rifles, .45 revolvers
- Reduces the number of powerful weapon types (energy sniper, combat shotgun)
- Replaces the submachinegun with a weaker one, reduces the number, adds extra magazines
- Adds a lot of things to the medical and engineering ERT sections
- Replaces weapon power cells with self-charging weapon power cells
- Adds a few recharging high capacity power cells (Reskin of slime power cell), and a bunch of hyper capacity power cells
- Adds some miscellaneous devices (Translocator, shelter capsule, binoculars) to the hardsuit section
- Replaces the hardsuit section's grenade launchers with two sprint modules and a micro pharmacy
- Adds LMGs to Zulu's armory
2018-10-10 19:02:48 -04:00
