Chompstation Bot
9eeb02ce42
Various HUD job icons additions and adjustments
2021-07-04 02:11:03 +00:00
Chompstation Bot
b6e1989a01
The One Where I Port Modals
2021-06-30 19:29:34 +00:00
Chompstation Bot
087c7b63be
[MIRROR] Refactors posters to use decls
2021-06-21 02:22:59 +00:00
Novacat
9074fc916f
Merge pull request #10661 from lbnesquik/Branch-Wet
...
Add a new contamination
2021-06-18 04:28:22 +00:00
Verkister
83b5051804
Update global_lists_vr.dm
2021-06-02 23:20:57 +03:00
Verkister
85a79d2cf6
Update global_lists_vr.dm
2021-06-02 20:01:38 +03:00
Verkister
f3d09944b7
Adds a bunch of stuff to trash eater list
...
Might push changes upstream too if I can be arsed to.
Added MRE bags, cracker and chocolate packs, pizza vouchers and boxes, the other toy subtype, seeds, some accessories, bibles, horns/ducks, torn inflatable doors, and towels.
2021-06-02 19:56:05 +03:00
Chompstation Bot
36db9dad68
Fixes traits not getting applied properly.
2021-04-12 14:34:01 +00:00
Nadyr
b29050d476
Merge branch 'master' into upstream-merge-10105
2021-04-11 06:29:26 -04:00
Nadyr
8ad86ed1f8
Merge branch 'master' into upstream-merge-10033
2021-04-11 04:45:06 -04:00
Chompstation Bot
b421878f3f
Fixes Traits
2021-04-09 01:21:15 +00:00
Chompstation Bot
588179bd66
Remove unnecessary 'signatures'
2021-04-08 16:48:30 +00:00
Chompstation Bot
43072b15c2
Trait Rebalance and Refactor
2021-04-07 19:40:58 +00:00
Nadyr
81d55a1cb2
Merge pull request #1682 from MisterGrimm/Genaprawns
...
Player Xenomorph Overhaul 1.1 , the Genaprawns
2021-03-28 21:53:36 -04:00
Nadyr
4a8c021ea4
Update global_lists_vr.dm
2021-03-28 00:27:49 -04:00
Sym
8ca11f0439
Changing player Xenomorphs to Genaprawns
2021-03-26 19:42:08 -04:00
Chompstation Bot
8db3a020a0
Micro March beta update.
2021-03-26 23:23:02 +00:00
Nadyr
48d8812b9e
Update global_lists_vr.dm
2021-03-21 02:00:04 -04:00
Chompstation Bot
2a5c21c8f5
[MIRROR] Kaleidoscope 2: The Retabbening
2021-03-21 01:24:14 -04:00
Chompstation Bot
d11ff04c30
Silky, silky webs. Adds Weaver trait, with ability to weave spiderwebs and more!
2021-02-26 21:41:34 +00:00
Nadyr
39292dfe36
Merge pull request #1291 from CHOMPStationBot/upstream-merge-9676
...
[MIRROR] Adds in 1 new eggs end 3 joke eggs.
2021-02-14 07:33:01 -05:00
Verkister
113bf6356a
Merge pull request #9676 from H0lySquirr3l/master
...
Adds in 1 new eggs end 3 joke eggs.
2021-02-11 10:59:20 +00:00
Razgriz
14c7fcfef1
Merge branch 'master' into trash-eat-bots
2021-02-04 14:26:50 -07:00
Chompstation Bot
d3c7cc6040
New advanced Egg Release mechanics.
2021-02-01 19:35:41 +00:00
kcin2001
3ba3df17f0
adding misc trash eat items
2021-01-29 23:15:00 -08:00
Chompstation Bot
be8d010ff9
Converts Morph Spawn and Maint Pred events to use ghostpods
2021-01-27 02:25:00 +00:00
Chompstation Bot
9c8634a84b
Makes most neutral traits available to all species
2021-01-24 06:33:08 +00:00
Chompstation Bot
f7df37c72d
Adds Verie's fluff items + framework for hair accessories
2020-12-11 12:13:12 +00:00
Repede
5bc7f0bd72
'Reverts' a bunch of changes that we've made through the years and see if any of those could have been the cause for out of memory errors to start appearing, unchecks a bunch of unused things like mining rewards and coin-shop as well as some admin systems that are not checked on upstream.
...
Also readds vore monkeys
2020-07-26 12:48:22 -04:00
izac112
601a155b30
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-07-25 15:22:42 +02:00
Unknown
5d7afad7c3
Conflict Resolution
2020-07-24 09:07:41 -04:00
Repede
7f1a6d6cc7
Fuck this shit
...
Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
# code/controllers/autotransfer.dm
# code/controllers/subsystems/inactivity.dm
# code/game/area/Away Mission areas.dm
# code/game/area/Space Station 13 areas.dm
# code/game/jobs/job/captain.dm
# code/game/jobs/job/civilian.dm
# code/game/jobs/job/security.dm
# code/game/jobs/jobs.dm
# code/game/machinery/air_alarm.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/machinery/suit_storage_unit_vr.dm
# code/game/mecha/combat/gorilla.dm
# code/game/turfs/simulated/dungeon/wall.dm
# code/game/turfs/simulated/wall_types.dm
# code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
# code/modules/clothing/spacesuits/void/void_vr.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/mob/language/station_vr.dm
# code/modules/mob/living/carbon/human/emote_vr.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
# code/modules/mob/new_player/sprite_accessories_vr.dm
# code/modules/power/apc.dm
# code/modules/power/lighting.dm
# code/modules/resleeving/machines.dm
# config/jobwhitelist.txt
# icons/mob/species/seromi/head.dmi
# icons/mob/species/seromi/suit.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# maps/tether/submaps/_tether_submaps.dm
# maps/tether/tether_areas2.dm
# maps/tether/tether_defines.dm
# maps/tether/tether_shuttles.dm
# nano/templates/apc.tmpl
# vorestation.dme
2020-04-04 14:37:55 -04:00
Unknown
c960a9ec30
Finishes this PR
2020-03-17 14:00:02 -04:00
Repede
5178fe3419
Geneshadekins will stop phasing on death.
2020-02-15 14:00:25 -05:00
izac112
933385020f
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
...
# Conflicts:
# code/modules/mining/machine_stacking.dm
# Resolved
# code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm # Resolved mostly besides line 717 "plasteel: undefined var"
# even though the only change in this line is removing the comment
# icons/mob/widerobot_vr.dmi
# Resolved
# maps/tether/tether-07-station3.dmm
# Resolved
2020-01-31 18:23:50 +01:00
Heroman
ede140ec9c
Fixes grub event end announcement not functioning
2020-01-14 05:58:38 +10:00
Hawk_v3
8a0b78c322
Merge remote-tracking branch 'upstream/master'
2020-01-01 15:16:53 +00:00
Unknown
750c6f0ea7
Remove medicine bottle from TE Whitelist
2019-12-31 18:09:13 -05:00
Hawk_v3
6b935d64ec
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +00:00
Meghan-Rossi
604fd1b74f
Resolve conflicts, fix compile errors
2019-12-19 17:49:21 +00:00
Luke Vale
d8d92ed78b
Adds in the //YW edits to the VR files
2019-11-25 22:10:56 -06:00
Luke Vale
a3aa3f252e
Adds in GeneShadekins. A form of shadekin without their powers.
2019-11-25 22:02:12 -06:00
Heroman3003
62889c39d9
Removes deprecated code
2019-11-15 08:38:53 +10:00
Heroman3003
a3fb3e3950
Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin
2019-10-29 09:33:48 +10:00
Poojawa
f718201974
Adds Sound Code and toggles
2019-10-13 02:05:16 -05:00
TheFurryFeline
f1ba4aca5e
Nom the Communicators!
...
Making a call with your friend? Want to give them a good view of what you can do to them? Here ya go~! Also includes commwatches by default since they're a child of the device/communicator. :3 Ports https://github.com/CHOMPstation/CHOMPstation/pull/798 because I rather like it. Would be interesting when used for scenes or tempting partners into a future scene.
2019-09-19 03:58:43 -04:00
TheFurryFeline
2877917f3a
Suit Sensors Selectable
...
Allows selection of suit sensor settings in VORE tab on Character Setup. Work credited to https://github.com/PolarisSS13/Polaris/pull/4354 Adjustments made as needed to account for outdated code as well as making use of preferences_vr at last.
2019-08-05 17:49:49 -04:00
TheFurryFeline
ca01048bab
Edible Collars
...
Allows those with Trash Can trait to nom on someone's collar. Also adds in a custom flavour message.
2019-07-10 13:43:29 -04:00
Heroman
b17718ea6c
Implements selection of whitelisted species
2019-04-28 17:45:44 +10:00
Heroman3003
1290db61f8
Initial commit
2019-04-26 11:19:53 +10:00
