Repede
4cf7f71be6
Merge branch 'release' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/area/Away Mission areas.dm
# code/game/objects/items/weapons/stunbaton.dm
# code/game/objects/items/weapons/teleportation.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/events/event_container_vr.dm
# code/modules/mining/ore_box.dm
# code/modules/paperwork/paper.dm
# code/modules/rogueminer_vr/zone_console.dm
# config/custom_items.txt
# icons/mob/items/lefthand_suits.dmi
# icons/mob/items/righthand_suits.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/suits.dmi
# maps/tether/tether_defines.dm
2020-02-22 12:38:04 -05:00
Arokha Sieyes
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
Shadow
7e831fc9f1
Covfefe
2020-01-25 20:09:13 -06:00
Hawk_v3
6dcf1520b4
Let's get this wrapped up and ready to go.
...
Removed all KHI references, and the Vore AI Law stuff.
2020-01-13 19:38:10 +00:00
Hawk_v3
20596d9787
Merge remote-tracking branch 'upstream/master'
2020-01-13 00:01:47 +00:00
Heroman
9490261230
Adds Kitsuhanan Cure for resleeving sickness
2020-01-06 07:15:13 +10:00
RadiantFlash7
e26b48d335
Map fixes.
...
Reduces RCD cost per use of mattercartridges.
Readds Fancy coffeeshop sign.
Re-adds Bluespace coffee.
Fixes bluespace coffee sprite and code.
Fixes access to rad shelter on sublevel 2,
Fixes space tiles in main level window of sec outpost,
Fixes SMES names and RCON names to be the same now.
Fixes Skydiving teleporter (Updated refractored code)
Removed extra APCs, and security cameras facing the wrong way.
Tries to fix Debris field teleporters (still don't understand why theres a second destination in the shuttle console. Halp.)
Increases explorer job slots. 2 is not 'nough.
Reduces efficiency of cooling loop for TEG. (Waiting on Izac's weakened TEGS for further update)
Buffs health of freezable airlocks, so spiders won't constantly destroy them so quick.
Fixes borked up wire connecting solars to main.
Fixes incorrect facing security camera in security.
Adds status displays to escape,
changes explorer limit from 5 to 3. (what was I thinking?)
Still an improvement over 2.
2020-01-05 01:09:08 -05:00
Hawk_v3
a48b6f7cb2
Merge remote-tracking branch 'upstream/master'
2019-12-29 19:01:58 +00:00
Atermonera
45b4947d1e
Merge pull request #6584 from TheFurryFeline/TFF-Print_Da_Sprayers
...
Printable Spray Bottles
2019-12-25 18:10:16 -05:00
Hawk_v3
5b13642c12
Merge remote-tracking branch 'upstream/master'
2019-12-08 18:15:35 +00:00
Unknown
ea4c6075b7
Fixes busted syringes
2019-12-07 10:25:28 -05:00
Hawk_v3
f976948ce3
Merge remote-tracking branch 'upstream/master'
2019-11-07 19:54:10 +00:00
Mechoid
e1fa847bc2
Xenowork Prep For Future ( #6491 )
...
* Xenowork, weeds walls and material blobs.
* More weeds
* XenoUpdoots
* Stop that, me.
2019-11-04 21:38:02 -05:00
Hawk_v3
3c8cd11eac
Reupdated Station 1 map
2019-10-24 21:57:58 +01:00
Mechoid
169d8acedd
Medical Expansion
2019-10-19 23:28:38 -04:00
Hawk_v3
6e801b1e8e
Map Updates.
2019-10-04 01:52:44 +01:00
Unknown
fdca4f7554
Master Runtime Fix
2019-10-01 03:09:58 -04:00
Hawk_v3
a333c03a3c
Merge remote-tracking branch 'upstream/release'
2019-09-14 17:10:36 +01:00
Heroman
31d459f230
Fixes Blood-Onator
2019-09-14 15:01:58 +10:00
Hawk_v3
b6ebecf7ec
Merge remote-tracking branch 'upstream/master'
2019-08-30 21:38:17 +01:00
Unknown
14eb525030
Adjusts Vorestation pills and pillbottles
2019-08-28 04:06:19 -04:00
Hawk_v3
0f3c802427
Merge remote-tracking branch 'upstream/master'
2019-08-22 21:32:01 +01:00
Atermonera
8f067fe785
Chemistry Expansion
2019-08-21 17:43:01 -04:00
Hawk_v3
96b8a7ab95
Merge remote-tracking branch 'upstream/master'
2019-08-17 21:06:48 +01:00
Novacat
dd7a7842ed
Merge pull request #5567 from Novacat/nova-survival
...
Adds Prototype Hypospray
2019-08-12 13:15:35 -04:00
Hawk_v3
0c85b3a4dd
Merge remote-tracking branch 'upstream/master'
2019-08-09 21:35:04 +01:00
Atermonera
0469a309cc
Adds NOCONDUCT to Some Items
2019-08-08 16:07:50 -04:00
Novacat
8e321b3725
Update hypospray.dm
2019-08-06 22:10:50 -04:00
Unknown
d7406088b5
Test
2019-08-06 21:07:40 -04:00
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
