mistyLuminescence
c406672c26
Adds two new Cargo crates!
2019-06-29 19:46:41 -04:00
Anewbe
3da73d53f3
Merge pull request #6244 from Heroman3003/cargofix
...
Fixes glucose crate spawning
2019-06-29 19:26:57 -04:00
Heroman
180d8e8df0
Standartizes _vr container definitions
2019-06-29 04:17:59 +10:00
Heroman
cbb37fdeb1
One more forgotten exception
2019-06-28 17:13:42 +10:00
Heroman
a16fcd2ae5
Fixes quantum pad and telepad teleportations
2019-06-28 05:51:05 +10:00
mistyLuminescence
711e807d32
tinytweaks
2019-06-21 17:07:51 -04:00
Hawk_v3
129ac045e7
Merge remote-tracking branch 'upstream/master'
2019-06-12 18:47:10 +01:00
Neerti
21244ade2f
Merge pull request #6204 from Ketrai/worms
...
Adds worms
2019-06-11 17:35:11 -04:00
Hawk_v3
70a2fa937c
Merge remote-tracking branch 'upstream/master'
2019-06-05 00:25:36 +01:00
Atermonera
8e215ec10f
Allows supplypacks with req_one_access to exist
2019-06-04 13:15:14 -04:00
Spades
1ddecf112e
Merge pull request #5292 from Ketrai/fishbranch
...
Adds lobsters and cuttlefish
2019-06-03 21:06:22 -04:00
Hawk_v3
7bb9c92c9a
Merge remote-tracking branch 'upstream/master'
2019-06-03 12:31:48 +01:00
Novacat
b88ba6f233
Merge pull request #5279 from Heroman3003/crateaccess
...
Access fixes for carogopacks
2019-06-02 14:45:57 -04:00
Heroman
3e62bbcca1
Moves restriction to _vr file
2019-06-02 07:13:15 +10:00
Ketrai
95edaac47c
Adds monkfish
...
ITS HOOG
2019-05-31 17:17:29 +02:00
Ketrai
e9cc1e48ab
Adds lobsters and cuttlefish
2019-05-29 22:37:59 +02:00
Atermonera
ef4c7b6601
Merge pull request #6172 from mistyLuminescence/contacts
...
Makeover Kit
2019-05-28 13:10:09 -04:00
Heroman3003
43cad962c6
More adjusting
2019-05-28 12:21:13 +10:00
Heroman3003
7ef057227c
Access fixes for carogopacks
2019-05-28 12:13:55 +10:00
Hawk_v3
470c86fb45
Merge remote-tracking branch 'upstream/master'
2019-05-08 19:59:55 +01:00
Heroman
ed55a2f6cd
Fixes Offduty engi and explorers spawning without survival boxes
2019-05-05 08:17:51 +10:00
Hawk_v3
27e73883fc
Merge remote-tracking branch 'upstream/release'
2019-05-04 21:03:48 +01:00
Atermonera
8e724ad32c
Merge pull request #6133 from Heroman3003/cart-tweek
...
Minor PDA cartridge tweaks
2019-05-01 14:08:33 -04:00
Novacat
fb52ec08c6
Merge pull request #5114 from Novacat/nova-weapons
...
Expedition Sub-department
2019-04-28 22:57:13 -04:00
Neerti
16b3b58259
[REVIEW] Ports Modular Computers from Baystation
2019-04-28 22:06:40 -04:00
Heroman
703c27da7e
Refactors shadekin
2019-04-28 15:10:06 +10:00
Novacat
536d209e29
Update civilian.dm
2019-04-27 22:33:06 -04:00
Anewbe
13ccd7533f
Removes Resident from the Southern Cross
2019-04-27 21:05:10 -04:00
Unknown
729b1fc662
Changes off Duty ID Aesthetics
2019-04-25 19:56:47 -04:00
Unknown
f21c5e4430
Adds Subtle Teleporter
...
It is also a structure, which should make it easier to use in buildmode. Current uses vanilla portal sprite.
2019-04-24 20:20:51 -04:00
Unknown
8fef0c5045
Survival Kits for Off Duty Explorers
...
...I love those things too much.
2019-04-24 14:00:11 -04:00
Hawk_v3
50e2482613
Merge remote-tracking branch 'upstream/master'
2019-04-22 20:12:14 +01:00
Atermonera
9152030002
Merge pull request #6117 from Neerti/ai_shell_manifest_fix
...
Hides AI Shells from the manifest.
2019-04-22 14:31:22 -04:00
Unknown
afc0d67f21
[WIP] Expedition Sub-department
...
- Moves explorer job roles from their respective departments into an Exploration sub-department
- CHAIN OF COMMAND WILL REMAIN UNCHANGED
- ACCESS WILL REMAIN UNCHANGED
Note: Pathfinder's minimum access is getting tweaked, in case minimum access ever gets used.
This is a purely clerical change that is being done for two reasons.
1: To enable off duty exploration role, important for the upcoming timeclock PR. The upcoming timeclock functionality will cause difficulties for expedition roles, due to, at present, being in a wide variety of different departments.
2: Generally, explorer roles in other departments tended to create confusion, as people would ask (or even demand) those roles to do station-side duties, even if their access (or lack thereof) made it impossible.
2019-04-21 17:05:58 -04:00
Hawk_v3
41f0bd9f6d
Merge remote-tracking branch 'upstream/master'
2019-04-14 19:44:13 +01:00
Neerti
068ac72e10
Merge pull request #6076 from Heroman3003/double-shock-fix
...
Fixed the vendor machines zapping twice
2019-04-14 02:24:50 -04:00
Heroman
c62a184d15
Fixes organizations runtiming
2019-04-12 19:24:04 +10:00
Novacat
cc0893409f
Merge pull request #4960 from Heroman3003/telenommening
...
Fixes telenoms via command teleporter, fixes command teleporter sprites
2019-04-08 19:15:58 -04:00
Novacat
466516b066
Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"
2019-04-08 15:24:27 -04:00
Heroman
e05deb6566
Fixes ability to telenom via command teleporter
2019-04-08 18:42:29 +10: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
Neerti
1d59d8683c
Replaces AI-controlled Maint Drones with AI-controlled Borg Shells
2019-04-06 05:07:05 -04:00
Novacat
d7c7c073a5
Merge pull request #4868 from Novacat/nova-weapons
...
Adds liquidprotein rations
2019-04-05 17:17:53 -04:00
Heroman
b11015107c
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
Spades
c701f8c1c7
Merge pull request #4907 from Mewchild/MC-Virology
...
Makes Virology Usable
2019-04-04 22:08:10 -04:00
Mewchild
7128de61dd
MAkes Virology Usable
2019-04-04 19:38:11 -05:00
Heroman
72eef4ad4f
Both radiation procs should respect it.
2019-04-05 05:14:27 +10:00
Heroman
7f53eb35c3
Provides proper shielding to areas meant to be shielded
2019-04-05 05:13:35 +10:00
Novacat
da63d0bacf
Merge branch 'master' into nova-weapons
2019-03-30 23:00:48 -04:00
Neerti
f8c9664178
Explorer Update - Cataloguers
2019-03-30 16:19:24 -04:00
