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
Killian
dcd691245c
feex title
2020-02-17 10:35:55 +00:00
Novacat
e8526a420c
Update robot.dm
2020-02-17 01:30:10 -05:00
Novacat
5ea36b7a60
Update robot_movement.dm
2020-02-17 01:29:20 -05:00
Atermonera
c5b6dfa259
Fixes mining borg ore box movement astral sorcery
2020-02-17 01:18:31 -05:00
Repede
68c1745353
Merge branch 'master' into genefix
2020-02-15 14:15:17 -05:00
Repede
151c20d5aa
Removes whitelist for black-eyed shadekins.
2020-02-15 14:13:03 -05:00
Repede
5178fe3419
Geneshadekins will stop phasing on death.
2020-02-15 14:00:25 -05:00
Shadow
e8291f7de5
Fixes runtime/icon selection
2020-02-14 16:28:30 -06:00
Novacat
db2e0bf71c
Merge pull request #6573 from Heroman3003/hard-safety
...
Prevents resleeving sickness from affecting hardvore victims
2020-02-14 09:35:58 -05:00
Novacat
4f4a29b5fc
Merge pull request #6568 from VOREStation/stream
...
Remove use of <<
2020-02-14 09:34:12 -05:00
Heroman
b09c8c5a38
Prevents resleeving sickness from affecting hardvore victims
2020-02-14 10:07:02 +10:00
Arokha Sieyes
7f1aabbf25
Weird cases where to_chat freaks out
2020-02-12 19:38:45 -05:00
Arokha Sieyes
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
Heroman
94b8236398
Fixes new tools on pupdozer being duplicated
2020-02-13 07:08:43 +10:00
Atermonera
cb75ffdc72
Very low levels of radiation are no longer harmful ( #6684 )
2020-02-12 00:15:55 -05:00
Heroman3003
0d21e91b68
Merge branch 'master' into belt-mining
2020-02-10 22:47:42 +10:00
SplinterGP
090938cd06
Makes grey don't take damage from sulphuric acid
...
greys won't take damage from sacid
2020-02-09 23:34:01 -03:00
SplinterGP
ff7e364558
Greys get fire damage instead from being soaked in water and grey telep.
...
Now greys will get fire damage instead of toxin damage from water when soaked, the greys also now know what grey is doing telepathy with them (only grey)
2020-02-09 20:40:26 -03:00
SplinterGP
894058cb04
Makes psionic communiation grey restricted
...
No more species other than grey can get them (tested)
2020-02-09 13:08:13 -03:00
SplinterGP
7c0796668d
Adds grey, sprites for items, (jumpsuit etc.) for them, add them to rigsuit list, and also adds their language that they use and telepathy
2020-02-05 19:43:55 -03:00
Leshana
fffd922cde
Fix character setup preview icons rendering prior to SSAtoms initialization
...
- Rendering the characters involved creating mannequin mobs, prior to SSAtoms init these would not be initialized and thus have no DNA. This prints many warning messages, causes runtimes, and ultimately the icon does not render correctly.
- Its fixed here since it seems that needing to use mobs prior to initialization is a pretty unique edge case. Comment added to explain to future us.
2020-02-04 16:33:22 -05:00
Leshana
b7da221856
Fixes Runtime in living_vr.dm,428: Cannot read null.name
...
This was happening when null is passed for belly. Now it will print *null*
Also fixed root cause (at least one of them).
Animals can't have vore attributes enabled when vore_active = 0 because
then they don't get a belly.
2020-02-04 16:33:22 -05:00
Atermonera
af6992e09a
Merge pull request #6669 from Mechoid/FixSuitIconIssue
...
Fix issues introduced by the world server icon system port.
2020-02-04 15:51:20 -05:00
izac112
a792f018ee
.
2020-02-01 01:23:29 +01:00
izac112
52b41f0019
Might look better
...
Signed-off-by: izac112 <izac10@live.com >
2020-02-01 01:22:50 +01:00
izac112
684b737dd0
Re-Adds prom water damage
2020-02-01 01:11:13 +01:00
Repede
2be5ceca85
Fixes service borg having plasteel for some reason / compile fix
2020-01-31 17:44:15 -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
Novacat
923855a5d1
Update update_icons.dm
2020-01-30 02:03:56 -05:00
Novacat
69b1cbf995
Update update_icons.dm
2020-01-30 02:00:31 -05:00
Novacat
eb467280e8
Update update_icons.dm
2020-01-30 01:58:34 -05:00
Atermonera
130d942a2d
Ports Clothing Expansion Code from World Server
2020-01-28 14:16:24 -05:00
Novacat
75b8b621f9
Merge pull request #6490 from Rykka-Stormheart/shep-dev-borghound-buffs
...
Add additional tools for Research Hound and Pupdozer - Upstream Port
2020-01-26 16:38:37 -05:00
Novacat
f522a88378
Merge pull request #6489 from Rykka-Stormheart/shep-dev-pupdozer-model
...
Add Citadel RP Alternative Pupdozer + Additional Tools - Upstream Port
2020-01-26 16:38:25 -05:00
RadiantFlash7
bfef971ffd
Merge branch 'master' into master
2020-01-25 01:25:45 -05:00
RadiantFlash7
c2ea5fd750
Merge branch 'master' of https://github.com/RadiantFlash7/YWPolarisVore
2020-01-25 01:23:25 -05:00
RadiantFlash7
2931d08ffe
Medbay Re-work, gunless vendors
...
Moves Ballestics guns from vendors to equipment area in front of armoury (Still for officer's use.)
Reworks like. Most of medbay. (I pulled my hair out for you hawk. Love me ;-;)
Most important feature: Emotional support Corgi named Mister Wiggles.
2020-01-25 01:23:16 -05:00
Repede
5a9ab0a62a
Makes Teshari able to "see" (IC: Hear) people through walls, but as a drawback, are always near-sighted.
...
A deaf teshari cannot see mobs through walls, they are still near-sighted though.
Also re-adds ventcrawling for protean blobs.
2020-01-23 18:17:15 -05:00
Novacat
2914cbf2ce
Merge pull request #6497 from VOREStation/upstream-merge-6648
...
[MIRROR] Fix Water Resistance.
2020-01-23 17:40:31 -05:00
Novacat
37f2862660
Update species.dm
2020-01-23 17:14:31 -05:00
Atermonera
b2cafb7e14
Fix Water Resistance.
2020-01-23 17:13:51 -05:00
Heroman
824637d6a4
_vr
2020-01-24 08:13:45 +10:00
Heroman
d8c43701ff
Removes prommies weakness to water entirely
2020-01-24 08:11:02 +10:00
Heroman
2ca6c5870a
Earlyports fix for water killing everything
2020-01-24 07:59:24 +10:00
Heroman
38bf0a33c6
Fixes and re-implements Rogue Mining (Belt Mining)
2020-01-23 18:43:20 +10:00
Rykka
433ecaf14d
Add additional tools for Research Hound and Pupdozer - Upstream Port
...
Adding features from the other borg modules over to the dogborg versions.
Pupdozer:
Air Analyzer
Pipe Painter
Floor Painter
Geiger Counter
Plasteel manipulator
Research Hound:
ID card to open other borg interfaces
Organ gripper
Mech part gripper
Robot Analyzer
Welding tool
Wrench
Wirecutters
Multitool
Nanopaste reserves
Wire reserves
Port from YW/Chompstation - https://github.com/Yawn-Wider/YWPolarisVore/pull/390
2020-01-22 01:52:48 -07:00
Rykka
b43e7f9e71
Add Citadel RP Alternative Pupdozer + Additional Tools - Upstream Port
...
Adding "V2 Engidog" to Pupdozer list
Adding four modules to the Pupdozer module: Air Analyzer, Sheet Loader, Magnetic Gripper, Pipe Painter and Floor Painter.
Port from YW/ChompStation
2020-01-22 01:46:51 -07:00
Novacat
d7e919c66f
Merge pull request #6482 from VOREStation/upstream-merge-6636
...
[MIRROR] Fix various syntactic problems
2020-01-21 01:23:04 -05:00
Atermonera
5bcb9cc934
Fix various syntactic problems
2020-01-21 01:06:04 -05:00
