Commit Graph

2216 Commits

Author SHA1 Message Date
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
Luke Vale
aae26a2b54 more screaming 2020-07-04 04:03:19 -05:00
Luke Vale
8221cbc4ad Adds in the files because I'm a dummy 2020-07-04 01:25:23 -05:00
SplinterGP
2424a9f6d7 More autolathe fixes and icon stuff 2020-06-23 22:01:48 -03:00
SplinterGP
bc5d25c208 autolathe fixes 2020-06-22 22:55:58 -03:00
izac112
4864ad384d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-17 04:30:06 +02:00
Aronai Sieyes
e9c904b8e7 Merge pull request #8260 from lbnesquik/Kot-Explorer-Shield
Introduce a SINGLE themed, colored explorer shield.
2020-06-15 11:33:14 -04:00
Unknown
19d7b71382 More miscellaneous changes 2020-06-14 13:46:16 -04:00
lbnesquik
41b9c802a7 Actually put two in the crate. 2020-06-11 04:24:36 +02:00
lbnesquik
856d48467a Introduce a SINGLE themed, colored explorer shield
It is a simple hunk of metal, painted to a moody green or dangerous voidsuits purple and blacks.
It has a lower block chance than the real deal, but it is still a strong help against melee foes and the occasional beam or two. Do mind that those seem to be a lot squishier since the AI update.
And just like any tacticool object, it has a big flashlight stuck at the front to help with visibility, it's not like you can actually see much out of that slit.
You can order two for 80 points at cargo.
It actually starts in the pathfinder locker, meaning they decide whether or not it will be used.
2020-06-11 04:14:54 +02:00
izac112
79abbcbc2f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-03 18:30:13 +02:00
Unknown
8d170c8468 Removes Exploration Weapon Permits 2020-06-02 19:35:36 -04:00
Aronai Sieyes
719151a74a Port Bay's lockers, crates, largecrates, wall lockers 2020-05-31 12:26:00 -04:00
Razgriz
fe1c5f96e7 Comment out the ice pick for now
It's a map specific item for YW and causes some compilation issues. It's ok, we don't need it tho.
2020-05-30 12:55:29 -07:00
izac112
0d1fe7d706 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-30 16:01:43 +02:00
Aronai Sieyes
d3b1b10f4c Merge pull request #8109 from Novacat/nova-ert
Adds Explorer weapons to Uplink
2020-05-28 18:21:48 -04:00
Unknown
bd1fbd13b5 Adds Explorer weapons to Uplink
Mostly adding a lil bit of variety. Holdout is equal to egun and Frontier carbine equal to laser carbine.
2020-05-28 17:10:52 -04:00
Unknown
a313950f62 Fixes compile 2020-05-28 14:22:46 -04:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
izac112
2f8e296e0e Switches back from solcom to solgov and TCG to USDF 2020-05-24 14:10:51 +02:00
Razgriz
95612b919b Update outfit_vr.dm 2020-05-21 20:41:04 -07:00
Novacat
872bc17937 Updates Solgov/Sifguard uniforms 2020-05-21 14:21:19 -04:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Repede
3f4f33bbd8 Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates
# Conflicts:
#	code/modules/mob/living/carbon/human/emote_vr.dm
2020-05-18 20:30:52 -04:00
Aronai Sieyes
e3b5d24c8b Obsolete the PROXMOVE flag and uses 2020-05-18 13:31:54 -04:00
izac112
c14d144d45 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-18 16:05:36 +02:00
Aronai Sieyes
b21d384a2e Further molest revdata 2020-05-16 18:36:06 -04:00
izac112
a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
izac112
bbb084a354 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 09:06:27 +02:00
Aronai Sieyes
a23605c9fd Move cyberpunk detective gear to be suits, add long version 2020-05-15 14:17:34 -04:00
Aronai Sieyes
cc6592e35c Update revinfo proc 2020-05-15 11:21:30 -04:00
Aronai Sieyes
2c2e9c8e0d v e n d o t t 2020-05-14 22:29:16 -04:00
Unknown
ff5b1fbd82 Requested Changes 2020-05-14 20:44:27 -04:00
Aronai Sieyes
3bbec85296 Merge pull request #7843 from ShadowLarkens/screenalerts
Ported /tg/ style screen alerts, replacing the hunger icon with them
2020-05-14 09:52:06 -04:00
ShadowLarkens
f905cfc020 Ported /tg/ style screen alerts, replacing the hunger icon with them
This adds throw_alert() and /obj/screen/alert, a system that allows you
to do custom hud alerts for any variety of things from "You're too
cold!" to mecha status indicators for the pilot.

There's quite a few things that actually got replaced; the
fire/oxy/tox/co2 alerts are all now just alerts, as is nutrition. The
xenochimera feral indicator would probably be a good candidate for
conversion, but I didn't touch it in this PR. There's also a number of
new alerts, such as blindness, highness, legcuffed, buckled, handcuffed,
and probably some more I missed; read code/_onclick/hud/alert.dm and see
for yourself!

Additionally, a number of tweaks have been done to resisting code, to
make it so that there's an indicator when you're buckled or handcuffed,
and can just click the alert to start resisting. This includes a
refactor that combines the logic for lockers, holders, micros
escaping from shoes, and struggling in a gut all into one proc, called
container_resist(). This means that vore bellies actually no longer need
the resist override, but it's been left in place just in case someone
finds something else they want to use it for.

Also, the health and internals indicator got moved down one tile each.
Needed room for the alerts. If we add the oxygen tank action buttons
from /tg/ and remove the internals indicator, the health indicator can
go back where it was originally.
2020-05-13 19:36:01 -07:00
Aronai Sieyes
f2bd8f138b Make intercom power change stateful 2020-05-13 11:09:12 -04:00
izac112
6a7192c93f Update tools_1.dm 2020-05-13 10:23:37 +02:00
izac112
268443695b Revert "Probably a revert after this"
This reverts commit 1d5ba3f493.
2020-05-13 09:51:27 +02:00
izac112
1d5ba3f493 Probably a revert after this
Probably getting reverted but worth a shot.
2020-05-13 09:43:51 +02:00
Izac Joof Forsgren
19175c4c72 Merge branch 'master' into izac-voreupdate 2020-05-13 09:16:09 +02:00
SplinterGP
75c9b2fcd2 Removes few extra span that shoulnd't be there 2020-05-13 01:47:28 -03:00
SplinterGP
353576067a Typo 2020-05-13 01:29:44 -03:00
SplinterGP
e3f0f5eb3d More autolathe stuff 2020-05-12 23:39:23 -03:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Aronai Sieyes
6dc177ebc7 Fix very curious orbit offset issue (513?) 2020-05-07 22:23:28 -04:00
SplinterGP
c60d52d4ca saved 2020-05-07 23:01:47 -03:00
Razgriz
81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
2020-05-06 21:53:03 +02:00
Rykka
9ceb5f768b Fix clamp case breaking BYOND versions below 513.1490
513.1490 added `clamp` as a native proc
2020-05-06 06:42:36 -04:00
SplinterGP
163c8665a0 gotta manually add starting recipes from other machines 2020-05-06 01:27:26 -03:00