Commit Graph

715 Commits

Author SHA1 Message Date
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
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Atermonera
f758879431 mechs trigger mines. They're not very effective... (#7113) 2020-05-09 04:27:48 -04: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
Aronai Sieyes
0cad24568d Fix annoying stupid runtime thing 2020-05-03 17:48:05 -04:00
Aronai Sieyes
49aa045e47 More fixes for aliens.dm 2020-05-03 12:03:57 -04:00
Aronai Sieyes
23978b4be6 Rewrite a bunch of weeds stuff 2020-05-03 11:18:20 -04:00
Unknown
3f61b3362d Fixes compile error 2020-05-03 10:57:17 -04:00
Aronai Sieyes
7e475693a9 Fix for map-edge weeds checking contents of null turfs 2020-05-03 10:52:05 -04:00
Novacat
74cb8f19a1 Update tracer.dm 2020-05-01 14:22:45 -04:00
Mechoid
7066d04df5 Explorer Expansion: New Horizons 2020-05-01 14:20:29 -04:00
Leshana
10b0323d6f Use can_atmos_pass to reduce proc-calls in c_airblock()
- Add additional can_atmos_pass value ATMOS_PASS_PROC which indicates custom behavior requiring calling the CanZASPass proc.
  - The benefit being for the other three values we DON'T need to call CanZASPass at all!  We already know the behavior without the overhead of a proc call.
  - Obviously any atom with can_atmos_pass = ATMOS_PASS_PROC cannot now call ..() in CanZASPass() since the default behavior would be to (recursively) call CanZASPass()
  - This required re-numbering the constants, so I also fixed all code that assumed particular values for the constants.
- Switched all types which overrode CanZASPass with custom logic to be can_atmos_pass = ATMOS_PASS_PROC
- Changed /turf/c_airblock() to skip calling /atom/movable/c_airblock() for the three can_atmos_pass values that don't require calling the proc.
2020-04-30 14:50:57 -04:00
Leshana
4a2e8bb0c4 Fix return values of CanZASPass
- CanZASPass is supposed to return boolean.  Nobody noticed this bug because ATMOS_PASS_YES and ATMOS_PASS_NO happen to be defined as 1 and 0.  But thats not a good assumption to make, so lets fix it!
2020-04-30 14:50:57 -04:00
Novacat
3eaa2ad9fa Lore Overhaul (#7493)
* Lore Overhaul

* Further Updates

* Changes the year

* Reverts unedited files adds Dragor's file

* Fixes compile error

* Spelling error

* Fixfix

* Comma fixes!

* Parenthesis fix

* Removes Virgov references

* Purges remnants of UC

* Recommended Change

* More consistent naming
2020-04-29 19:59:03 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Aronai Sieyes
d3da6ae4a5 Refactor move code 2020-04-26 16:42:50 -04:00
Razgriz
0e6b752058 Merge pull request #307 from Shadow-Quill/ShuttleFix
[URGENT] Fixes shuttle.
2020-04-24 19:03:53 -07:00
Shadow Quill
2c8aefb881 Doop 2020-04-24 20:40:07 -05:00
Aronai Sieyes
a62a2e4072 WAH 2020-04-23 18:15:55 -04:00
Razgriz
09293a0b02 Merge branch 'master' into UpstreamMergeApril2020 2020-04-22 03:17:50 -07:00
Aronai Sieyes
a2e6467936 FOAAAAAAAM 2020-04-20 17:16:25 -04:00
Aronai Sieyes
bb59718238 Mark some vorestation edits 2020-04-17 11:24:59 -04:00
Repede
e44e346352 Release Update
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
2020-04-16 21:07:33 -04:00
Sheep
309c39d731 Adds the "Baa" Poster 2020-04-16 16:58:51 +01:00
Aronai Sieyes
a65715eb86 Add vorestation posters 2020-04-15 12:02:19 -04:00
Aronai Sieyes
a7590e81a9 Merge pull request #7210 from VOREStation/aro-shuttleiocn
Changes shuttle landing soon warning
2020-04-13 09:28:53 -04:00
Atermonera
2374a40908 A Tale of Blobs and Man 2020-04-13 01:35:01 -04:00
Razgriz
060f3686db Update reagent_ch.dm 2020-04-12 21:51:51 -07:00
Shadowfire
96e6e66705 puddle fix
Fix lack of blood trails
removed a world call I forgot to remove, derp
2020-04-12 12:23:14 +02:00
Razgriz
fa035f56aa Update reagent_ch.dm 2020-04-12 01:39:31 -07:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Aronai Sieyes
6ec7ad58d0 Changes shuttle landing soon warning 2020-04-11 18:18:27 -04:00
Atermonera
07fb7950a6 Merge pull request #6974 from Shadow-Quill/patch-1
Unfucks arrival shuttle latejoins when shuttle is docked
2020-04-11 02:51:26 -04:00
Leshana
9a4b3f7c8b Merge pull request #7159 from VOREStation/aro-fixes
2 fixes and Teshari maws
2020-04-08 19:30:35 -04:00
Atermonera
5c03273ce8 Merge pull request #6884 from Neerti/event_system_fix
Rewrites the Rewritten Event System
2020-04-06 16:23:39 -04:00
Aronai Sieyes
d5befb78e1 Fix infinite server destroying loop in interval effects 2020-04-06 12:08:55 -04:00
Novacat
36aa8ef340 Update map_effects.dm 2020-04-05 22:19:39 -04:00
Aronai Sieyes
d948096587 Adjust two things that loop forever 2020-04-05 22:17:42 -04:00
Repede
7f1a6d6cc7 Fuck this shit
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
2020-04-04 14:37:55 -04:00
Aronai Sieyes
94d6ccd763 Merge pull request #7117 from VOREStation/aro-lookingglass
Add Looking glass holodeck
2020-04-03 15:14:00 -04:00
Atermonera
d7a9416bb8 Clean up various things 2020-04-03 03:15:06 -04:00
Aronai Sieyes
df58a60554 Fix mines qdel 2020-04-02 20:28:40 -04:00
Leshana
75d9bee4a0 Fixes Runtime in chemsmoke.dm,177: Cannot read null.seed_name
- This was caused by create_spores() being called on seeds which were not registered with the plant_controller (becuase they had never been harvested)
- Instead of registering them, we can just pass the seed datum itself, that is all the chemsmoke needs anyway.
2020-03-30 19:21:34 -04:00
Aronai Sieyes
4ad035b16d Move most antag things to admin-loadable maps 2020-03-18 01:27:29 -04:00
Novacat
d722e4fac0 Update miscellaneous.dm 2020-03-17 01:02:16 -04:00
Atermonera
101c9c33c5 QoL: Projectiles 2020-03-17 00:55:56 -04:00
Shadowfire
6e3b4490dc Reagent belly phase 2
Heres the big bug fix and improvement update, first to list improvements and then fixes.

Custom max limit for vore bellies, so can be lower than 100 units.
Mechanical pref window now shows receiving and giving prefs.
receiving and giving prefs are now saved to client and no longer have to be set each shift, beta period is over so no need to make people actively activate the transfer system for fun stuff.
changed reagent rate system, now is fixed settings that allows even 24 hours time from 0 to 10, though there is no persistency system yet as its being reconsider how to implement without causing issues.
Changed up code to be less messy.
Made so attack logs for transfer are certain, to ensure griefers and such can be caught.
Custom name for reagents! Will affect what it is called when transfered and when spilling on floor, doesnt change actual chems name.
Transfer verb as well! So can be things like inject, pump, and other words for how liquid is transfered from a belly.
Custom puddle system! Spilling enough liquid spawns a puddle of that reagents color, with custom name affecting name and description!
Custom sloshing noise system, allows individual bellies to be enabled to slosh louder and more frequently with how much is in them, no worries, made it so the system just bases chance on the highest volume at a given time and not spam sounds, also the sloshing noises are tied to digestion noises preference for those not wishing to hear that stuff. A big thanks to wheatley for supplying some audio files for the sloshing!

bug fixing
made adjacancy check to transfer to avoid long distance liquid transfer, thats silly.
Fixed issue where failed attempt to find a container would result in succesful message even though nothing occurs.
2020-03-15 22:52:40 +01:00