cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-02 04:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,748 Commits 8 Branches 26 Tags
ed525cef2ca92d666d57ecdfd662113dd7fe85ec
Commit Graph

33150 Commits

Author SHA1 Message Date
Aronai Sieyes
ed525cef2c Merge pull request #4355 from VOREStation/upstream-merge-5650 
[MIRROR] Fix incorrect HUD/screen/hologram
 2018-10-10 17:40:57 -04:00
Aronai Sieyes
09035a8742 Merge pull request #4353 from VOREStation/upstream-merge-5646 
[MIRROR] Remove intensity from chemistry machines.
 2018-10-10 17:40:26 -04:00
Aronai Sieyes
52a993541a Merge pull request #4348 from VOREStation/upstream-merge-5641 
[MIRROR] Fixes several typos with oxygen_pump.dm.
 2018-10-10 17:40:09 -04:00
Aronai Sieyes
ea6867363b Merge pull request #4343 from VOREStation/upstream-merge-5640 
[MIRROR] Fixes laptop blocking grown adults.
 2018-10-10 17:27:24 -04:00
Anewbe
dc781b806d Merge pull request #5650 from lbnesquik/Kates-Why-Do-I-Have-To-Fix-This 
Fix incorrect HUD/screen/hologram
 2018-10-10 16:54:53 -04:00
Anewbe
726f01e15e Merge pull request #5646 from lbnesquik/Kates-Tiny-Tweak 
Remove intensity from chemistry machines.
 2018-10-10 16:54:30 -04:00
Spades
12b0f7fdff Merge pull request #4342 from VOREStation/upstream-merge-5635 
[MIRROR] Fix yes emote not working correctly.
 2018-10-10 05:27:04 -04:00
Spades
ae8b60f0d8 Merge pull request #4341 from VOREStation/upstream-merge-5634 
[MIRROR] Remove kobold.dm
 2018-10-10 05:26:42 -04:00
Spades
5b91c8fccd Merge pull request #4339 from Screemonster/idontgetsickigivesick 
Xenochimera virus tweak
 2018-10-09 17:07:36 -04:00
Spades
6988bfcc44 Merge pull request #4329 from VOREStation/upstream-merge-5638 
[MIRROR] Fixes chem master dumping reagents.
 2018-10-09 17:06:11 -04:00
Anewbe
e362c66f51 Merge pull request #5641 from avabee/patch-3 
Fixes several typos with oxygen_pump.dm.
 2018-10-09 16:36:23 -04:00
Atermonera
3943ef3dba Merge pull request #5640 from lbnesquik/Kates-Laptop-Fix 
Fixes laptop blocking grown adults.
 2018-10-09 13:52:53 -04:00
Atermonera
6be6f9a957 Merge pull request #5635 from lbnesquik/Kates-Emote-Fix 
Fix yes emote not working correctly.
 2018-10-09 13:48:35 -04:00
Atermonera
6b6f811278 Merge pull request #5634 from lbnesquik/Kates-Kobold-Remov 
Remove kobold.dm
 2018-10-09 13:44:16 -04:00
Screemonster
e3356ed5fe Xenochimera tweak 2018-10-09 14:12:02 +01:00
Spades
ec3fb80f97 Merge pull request #4335 from Novacat/nova-heterochromia 
Rebalances VR Jumpsuits
 2018-10-08 20:48:13 -04:00
Spades
f6ce097810 Merge pull request #4325 from VOREStation/upstream-merge-5639 
[MIRROR] Fixed smes terminal construction requiring more cable than used.
 2018-10-08 20:43:38 -04:00
Spades
ea056f6b88 Merge pull request #4316 from VOREStation/upstream-merge-5628 
[MIRROR] Minor issues fix.
 2018-10-08 20:29:08 -04:00
Unknown
b237af9eab Rebalances VR Jumpsuits 
Virgo-specific jumpsuits (KHI and Star Trek) available in loadout are not supposed to have protection bonuses over the non-virgo ones.
 2018-10-08 17:41:07 -04:00
Arokha Sieyes
92eff67417 Alter gateway access on 2 jobs 
Add gateway access to pathfinder, exploring is their job
Removed from HoP (who can readd it to themselves in emergencies if they need it, otherwise during 'normal times' there's no reason they'd need it)

Justifcations for leaving it with other jobs:
HoS - gateway area is classified as a high-security area, and is an area on the station that has an attack surface from unknown things, so it makes sense they have access to defend it. HoS abusing the access for 'not defense of station' reasons, such as 'I'm going to lead my own expedition, fuck explorers', is ahelpable.
CD - literally has all station access, doesn't even have a specific list
RD - generally has a superset of all pathfinder access, and the physical gateway structure is their machine, pretty sure
 2018-10-08 15:33:48 -04:00
Spades
ccc1fa30ec Merge pull request #4313 from Novacat/nova-pathfinder 
Expedition Balance Tweaks
 2018-10-07 18:00:00 -04:00
Spades
311e184fb0 Merge pull request #4311 from lbnesquik/Kates-Hippo-Mob 
Hippo mob + Simple mob sounds
 2018-10-07 17:59:07 -04:00
Spades
189b724c59 Merge pull request #4305 from lbnesquik/Kates-Observe 
Fix misleading alert.
 2018-10-07 17:58:46 -04:00
Spades
8a657ce011 Merge pull request #4177 from Verkister/slowitemgurgles 
Makes item digestion gradual and belly damage based.
 2018-10-07 17:58:02 -04:00
Spades
f379ea2df4 Update weldingtool.dm 2018-10-07 17:55:35 -04:00
Spades
b1b565c352 Update weldingtool.dm 2018-10-07 17:55:01 -04:00
Spades
91a67b6b37 Update weldingtool.dm 2018-10-07 17:54:35 -04:00
Anewbe
e1e5109c42 Merge pull request #5638 from lbnesquik/Kates-Chemistry-Fix 
Fixes chem master dumping reagents.
 2018-10-07 16:44:17 -04:00
Anewbe
9a4a01a8bb Merge pull request #5639 from Heroman3003/smes-fix 
Fixed smes terminal construction requiring more cable than used.
 2018-10-06 16:04:40 -04:00
Spades
8c2e0928fa Merge pull request #4130 from KasparoVy/fix-tesh-hide-again 
Fix Teshari Hiding Again
 2018-10-06 08:25:35 -04:00
Atermonera
fafd85957f Minor issues fix. 2018-10-06 01:17:19 -04:00
Kates
06f01d9e58 Update new_player.dm 2018-10-06 03:27:58 +02:00
Unknown
5d7a974679 Reverts Phaser Nerf 2018-10-05 16:56:16 -04:00
Unknown
af4afc3e32 Fixes bug with holdout phasers 2018-10-05 02:04:30 -04:00
Unknown
e20f05e188 Expedition Balance Tweaks 
- Removes hostile mobs from V4 Beach
- Adds Giant Snakes and Giant spiders in generic V4 Cave spawners
- Reduced respawn rates to cut down on incidences of 'deathclaw swarms'
- Giant Snakes and Deathclaws have reduced overall spawn rates, Giant Spiders and Frogs will generally be more common.
- Replaced Ion hivebots with Ion Spiders
- Reduced expedition phaser to 5 shots
 2018-10-04 21:55:27 -04:00
lbnesquik
d0c8e1505c Fix and error pointed out. 2018-10-04 21:01:23 +02:00
lbnesquik
0b5dbd3fd1 Hippo mob + Simple mob sounds 
Adds an hippo with sprites given by kligor.
Adds the possibility for swallow noises.
 2018-10-04 02:48:28 +02:00
Anewbe
741d6fbea5 Shotgun cycling animation framework 2018-10-03 14:30:56 -04:00
lbnesquik
fdd5d10b54 Fix misleading alert. 2018-10-03 18:36:39 +02:00
Spades
c8c7843b8c Merge pull request #4297 from Mewchild/MC-SecPatchFix 
Changes Secpatch Path in Loadout
 2018-10-02 19:48:40 -04:00
Spades
0f83a1932e Merge pull request #4301 from VOREStation/upstream-merge-5619 
[MIRROR] Text for handheld plushies when poked
 2018-10-02 18:01:24 -04:00
Spades
9ce8b0a6be Merge pull request #4300 from VOREStation/upstream-merge-5621 
[MIRROR] Fixes some bloodloss bugs
 2018-10-02 18:00:50 -04:00
Anewbe
9498d6f7db Merge pull request #5619 from SpadesNeil/toy-sounds 
Text for handheld plushies when poked
 2018-10-02 14:20:47 -04:00
Atermonera
7b92808a20 Merge pull request #5621 from Anewbe/hemophilia 
Fixes some bloodloss bugs
 2018-10-02 03:11:29 -04:00
Anewbe
9b9410e5cb Merge pull request #5618 from Verkister/patch-15 
Fixes grabs breaking defined mob pixel offsets.
 2018-10-01 21:25:57 -04:00
Spades
3f1a5de182 Merge pull request #4240 from Mewchild/MC-Medals 
Medal Whitelists from abduction event
 2018-10-01 19:22:20 -04:00
Mewchild
19ed4485c1 Changes Secpatch Path in Loadout 2018-10-01 09:36:16 -05:00
Verkister
5a49904f57 Merge branch 'master' into slowitemgurgles 2018-10-01 16:32:53 +03:00
Spades
d0717c1f45 Merge pull request #4295 from VOREStation/aro-gatewayscatter 
Fix gateway scatter landmarks
 2018-10-01 09:31:36 -04:00
Spades
020d760ede Merge pull request #4294 from VOREStation/aro-proteandrop 
Proteans drop items when blob
 2018-10-01 09:31:14 -04:00