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
Repede
7fc70caa43
Resetting master
2020-02-22 12:28:01 -05:00
Repede
1950b800d0
Rin Deimos fluff item, just a crystal that does nothing.
2020-02-18 19:33:17 -05:00
Meghan-Rossi
dfc42293c7
Fluff items and species whitelisting
...
*Adds AmareWolf to Xenochimera whitelist - approved in https://forum.vore-station.net/viewtopic.php?f=46&t=1655
*Adds medal of unity for Roy Tilton - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1629
*Adds balaclava for Monty Kopic - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1628
*Adds warning collar for Excess - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1593
*Deletes obsolete/unused file "custom_items.txt"
2020-02-18 00:27:36 +00:00
Repede
130ef71bac
Merge branch 'master' into promwaterchemreagentreadd
2020-02-17 08:24:30 -05:00
SplinterGP
aa4f6a2e94
Adds aroozee fluff item
2020-02-16 22:35:41 -03:00
Cebutris
a3a22796ae
hot hot egg
2020-02-14 17:11:10 -05:00
Arokha Sieyes
74c6f7c1e7
Rename "Aronai Kadigan" -> "Aronai Sieyes"
2020-02-14 11:06:04 -05:00
Arokha Sieyes
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
Heroman
8e26511aa1
Prevents some teleporting abuses with taur riding
2020-02-08 07:45:53 +10:00
Shadow
ca7fd68c99
Fluffi Item
2020-02-02 15:16:31 -06: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
Cebutris
3450336020
does the thing, and another thing
2020-01-20 13:44:02 -05:00
Heroman
43065cb062
Changes harpoons push mode to teleport user and not everything else (pull mode unchanged)
2020-01-14 11:12:10 +10:00
Cebutris
95a86ad1c4
foxicide fluff items
2020-01-13 19:27:33 -05:00
Hawk_v3
8a0b78c322
Merge remote-tracking branch 'upstream/master'
2020-01-01 15:16:53 +00:00
Unknown
64b4d435f9
Joan's spacesuit no longer NORMAL size
2019-12-29 11:26:37 -05:00
Repede
ecb31d04e0
Merge branch 'master' into master
2019-12-22 11:51:38 -05:00
Repede
b41698c720
Merge branch 'master' into master
2019-12-21 21:35:09 -05:00
Repede
a140d91d93
Merge branch 'master' into plaguefix
2019-12-21 21:34:42 -05:00
Repede
5f39877328
Fixes plague doctor mask
2019-12-21 17:33:33 -05:00
Hawk_v3
6b935d64ec
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +00:00
RadiantFlash7
af25a14c06
Map fixes
...
Map fixes and fixing my fluff item's sprite. It failed a merge forever back.
2019-12-21 00:10:44 -05:00
Novacat
309a7af8fc
Merge pull request #6289 from EllyBrown/master
...
Changes to my fluff clothing "Star Sweater" (#2 )
2019-12-10 20:58:50 -05:00
EllyBrown
ea99d275e3
Update custom_clothes_vr.dm
2019-12-11 00:59:00 +02:00
EllyBrown
237b50bf7f
Add files via upload
2019-12-11 00:09:42 +02:00
Hawk_v3
5b13642c12
Merge remote-tracking branch 'upstream/master'
2019-12-08 18:15:35 +00:00
Repede
f9688aea70
Edgyness increase
2019-12-08 01:12:17 -05:00
Repede
461fcfd160
Fixing medal fluff
2019-12-06 16:10:35 -05:00
Novacat
e5c7d83aba
Merge pull request #6222 from Novacat/nova-pathfinder
...
Centcom/Tether Ship Changes
2019-12-06 16:06:56 -05:00
Keila-coon
b0abdc4491
Merge branch 'master' of https://github.com/Keila-coon/YWPolarisVore
2019-12-01 02:38:56 -04:30
Keila-coon
e10c7d4482
Fluff item request updated
...
-Deleted the place holder for the modkit
2019-12-01 02:38:52 -04:30
Keila-coon
698d5d564d
Merge branch 'master' into master
2019-11-29 13:07:46 -04:00
Keila-coon
bd20725406
Update custom_clothes_yw.dm
2019-11-29 12:34:04 -04:30
Keila-coon
228d0df6e3
ditto for medal
2019-11-29 11:02:19 -04:30
Keila-coon
647f76c863
Domine's fluff item
...
Medal of valor added
2019-11-29 10:39:31 -04:30
TheFurryFeline
9170d42f70
Expired Permit Removal
...
Title.
2019-11-28 08:52:59 -05:00
Unknown
aa25f5ebbd
More Updates
2019-11-27 15:50:54 -05:00
Heroman
fb6f43d3e2
Moves Tempest's sirenbags to soundloop system
2019-11-24 17:13:39 +10:00
Hawk_v3
a5c7909ed7
Merge remote-tracking branch 'upstream/master'
2019-11-17 12:42:55 +00:00
TheFurryFeline
aaa40000d0
Mouse Plushie Sprite Change
...
Title, changes a custom item's sprite to look more alive... Sorta.... Just doesn't make it look like it's a hecking dead mouse. Ported from https://github.com/CHOMPstation/CHOMPstation/pull/824
2019-11-12 10:34:24 -05:00
Shadow
48ba6c652d
Changes character's name for fluff item
2019-11-11 22:56:25 -06:00
Novacat
929ff8077c
Merge pull request #6171 from EllyBrown/master
...
Elly Brown (bacon12366) fluff item.
2019-11-08 16:35:08 -05:00
EllyBrown
7d3ff451fb
Add files via upload
2019-11-08 19:36:36 +02:00
Meghan-Rossi
6bee95ef01
Fluff items
...
Removes Tasald's coat and loyalty implanter as requested in #6147
Adds Tasald's Cartographer's Uniform as approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1627
adds medals:
Xander Bevin - Conduct - https://forum.vore-station.net/viewtopic.php?f=27&t=1579
Nick Sloan - Conduct - https://forum.vore-station.net/viewtopic.php?f=27&t=1575
Erik Ramadwood - Unity - https://forum.vore-station.net/viewtopic.php?f=27&t=1624
Nolan Conaway - Unity - https://forum.vore-station.net/viewtopic.php?f=27&t=1622
Resolves #6147
2019-11-05 11:28:37 +00:00
Keila-coon
7afffc5096
Added modkit for fluff item
...
Modkit for mocha's suit
2019-10-29 22:34:59 -04:30
Keila-coon
4bc71346b0
Added hagawaga and moca_the_porg1 fluff item request plus an extra tail
...
Roman armor and Explorer suit
Striped tail, colorable
2019-10-29 14:39:25 -04:30
Repede
3e3bb830e2
Fluff items additions
...
+ NESGamer Lucy Price Cryostatis Thermos
+ Captmatt Kaenin medal of valor
+ Risingstar Stellar heart collar
+ cheeky srusu soviet uniform
2019-10-26 19:43:12 -04:00
DameonOwen
22674b143a
Fix cookie not deleting self. Add cookie to Amber Owen's loadout.
2019-10-19 15:25:31 -04:00
Repede
7bd184600a
Self-indulge commit: Adds CC Officer colored uniform and cloak for Teshari.
...
Fluffed it to Strix Hades as a loadout option.
2019-10-08 19:20:27 -04:00
