Atermonera
baf867e93d
Besrserkjuice doesn't spam chat ( #6893 )
2020-03-25 16:37:53 -04:00
Novacat
15bdd59852
Merge pull request #6982 from VOREStation/upstream-merge-6854
...
[MIRROR] Xenoarch Expansion
2020-03-24 22:57:12 -04:00
Leshana
9d335cf678
Quick fix to ensure events with skyboxes remove them at the end.
2020-03-24 22:16:48 -04:00
Novacat
f60096634e
Update ano_device_battery.dm
2020-03-24 21:45:09 -04:00
Atermonera
4384ca1727
Xenoarch Expansion
2020-03-24 21:43:27 -04:00
Novacat
ab54382995
Merge pull request #6980 from VOREStation/aro-dust
...
Fix dust zlevel choice
2020-03-24 21:10:32 -04:00
Aronai Sieyes
ac419404cb
Fix Dust level choice
2020-03-24 20:51:12 -04:00
Atermonera
6c94faa167
Makes Travis fail PRs that runtime during init/unit testing.
2020-03-24 17:29:09 -04:00
Novacat
b6e26ea163
Merge pull request #6953 from TheFurryFeline/TFF-Attack_Verb_Grammar_Fixy_Again
...
[Oversight] Mob Attacktext Fixy
2020-03-24 16:34:39 -04:00
Aronai Sieyes
2ea1802f68
Shove APCs and air alarms up on the wall a bit higher
2020-03-24 15:37:39 -04:00
Aronai Sieyes
6ebc236649
Merge pull request #6969 from VOREStation/revert-6968-upstream-merge-6882
...
Redo "[MIRROR] Machinery: Always use update_use_power()"
2020-03-24 15:09:21 -04:00
Leshana
5f9ec463c3
VOREStation Specific: Always call update_use_power() instead of directly setting the use_power var.
2020-03-24 14:40:54 -04:00
Atermonera
febb374443
Merge pull request #6882 from VOREStation/vplk-machinery-use-power
...
Machinery: Always use update_use_power()
2020-03-24 14:40:53 -04:00
Aronai Sieyes
9917826c85
Merge pull request #6965 from VOREStation/aro-fighters
...
Creates 2 new mech equipments and space fighters
2020-03-24 14:04:42 -04:00
Leshana
56f9e6b9dc
Revert "[MIRROR] Machinery: Always use update_use_power()"
2020-03-24 13:34:51 -04:00
Novacat
9dc324dbb3
Update autocloner.dm
2020-03-24 00:23:45 -04:00
Novacat
4b2b3b3a2f
Merge branch 'master' into upstream-merge-6882
2020-03-23 23:25:26 -04:00
Novacat
94f5eda84c
Merge pull request #6967 from VOREStation/upstream-merge-6881
...
[MIRROR] Add mob/living stat setter and observer
2020-03-23 23:25:02 -04:00
Atermonera
cbb40196fc
Machinery: Always use update_use_power()
2020-03-23 23:21:10 -04:00
Atermonera
87333d9c25
Add mob/living stat setter and observer
2020-03-23 22:47:44 -04:00
Atermonera
1873a3a870
Merge pull request #6880 from Greenjoe12345/teshariprosthetics
...
Teshari prosthetics
2020-03-23 22:38:13 -04:00
Aronai Sieyes
7dcfd12266
Merge pull request #6946 from VOREStation/aro-announce
...
Don't announce overmap events
2020-03-23 21:40:46 -04:00
Aronai Sieyes
36ee762c1a
Mecha cloaking generator
2020-03-23 21:34:32 -04:00
Aronai Sieyes
3a0cbdb1b1
Mecha omni-shield generator
2020-03-23 21:34:32 -04:00
Aronai Sieyes
1c38bd11ca
VR Cloaking framework
2020-03-23 21:34:32 -04:00
Aronai Sieyes
c93c5afefa
Adds atom/movable cloaking framework
2020-03-23 21:34:32 -04:00
Novacat
ba571acffc
Merge branch 'master' into TFF-Attack_Verb_Grammar_Fixy_Again
2020-03-23 18:52:43 -04:00
Aronai Sieyes
61bbf89144
Fix line endings
2020-03-23 10:37:19 -04:00
Atermonera
358d35b2aa
[Oversight] Yay, another typo fixy
2020-03-23 02:34:24 -04:00
TheFurryFeline
5c8ac8ccd1
Bitten to Bit
...
Sync with Polaris version per review.
2020-03-23 00:35:22 -04:00
Atermonera
2ec545c42b
Merge pull request #6883 from VOREStation/vplk-port-tickrate-change
...
Safely change world.fps for SStimer
2020-03-22 20:18:00 -04:00
Atermonera
b27990c5d0
Merge pull request #6870 from VOREStation/pol-aibash
...
Makes AI give up bashing if nothing to bash
2020-03-22 14:51:53 -04:00
TheFurryFeline
69032e3ec0
Horror Mob Attacktext Fixy
...
Title, Sif Mob attacktext fixes ported to active Polaris PR: https://github.com/PolarisSS13/Polaris/pull/6875
Changelog Nots:
- Fixes verb tense and spelling for all horror, vore, Sif, and birb subtype mobs.
2020-03-22 13:27:58 -04:00
Novacat
afa6aa785e
Merge pull request #6951 from Novacat/nova-basicfixes
...
Real Crash Fix
2020-03-22 09:32:41 -04:00
Unknown
8e0bd119b2
Real Crash Fix
...
Remind me never to code when dead tired
2020-03-22 09:18:20 -04:00
Novacat
6c52239b6c
Merge pull request #6947 from VOREStation/aro-combatdrone
...
Combat drone sprite
2020-03-22 09:17:42 -04:00
Runa Dacino
99b7377c5e
Unwhitelists solcom
...
Shouldn't be a whitelisted language, for some reason it was removed from vr exceptions. Readded.
2020-03-22 05:36:54 +01:00
Unknown
004e3682a0
Emergency Crash Fix
2020-03-21 23:53:51 -04:00
Aronai Sieyes
033e64f3c9
Combat drone sprite
2020-03-21 21:20:50 -04:00
Aronai Sieyes
d8d7ebf99a
Remove announcements from overmap events
2020-03-21 19:17:36 -04:00
Novacat
90e6e1fea2
Update lighting.dm
2020-03-21 16:47:52 -04:00
Atermonera
9f250ce3c9
Emergency lighting
2020-03-21 16:39:36 -04:00
Aronai Sieyes
e727a75f49
Merge pull request #6936 from VOREStation/aro-gunpods
...
Small mech tweaks, adds gunpods
2020-03-21 00:56:25 -04:00
Aronai Sieyes
106095365f
Merge pull request #6932 from VOREStation/aro-maptips
...
Add tooltips to visitable sectors on the overmap
2020-03-21 00:56:13 -04:00
EllyBrown
b6d893db49
Changes to the custom item. ( #6929 )
...
* Add files via upload
* Update custom_clothes_vr.dm
* Update loadout_fluffitems_vr.dm
* Update custom_clothes_vr.dm
* Update custom_clothes_vr.dm
* Update loadout_fluffitems_vr.dm
* Update loadout_fluffitems_vr.dm
* Update custom_clothes_vr.dm
* Update custom_clothes_vr.dm
2020-03-21 00:55:55 -04:00
Aronai Sieyes
4aaff0704e
Merge pull request #6925 from ShadowLarkens/vore_cleanup_less_cursed_maybe
...
Cleanup vore code
2020-03-21 00:52:46 -04:00
Aronai Sieyes
7cb680ab34
Merge pull request #6918 from VOREStation/upstream-merge-6826
...
[MIRROR] Port Landmark Shuttles
2020-03-21 00:52:08 -04:00
Unknown
80e5344901
Fixes Fennec/Xenohybrid hairstyles
2020-03-20 20:44:41 -04:00
Aronai Sieyes
d25e67ee56
Small mech tweaks
2020-03-20 19:49:11 -04:00
Atermonera
d397c2c1fe
Merge pull request #6840 from Neerti/qol_notification_sounds
...
QoL: Various Notifications
2020-03-20 15:09:47 -04:00
