Anewbe
c2794c571d
Hopefully fixes some tool-conversion things
2018-08-03 15:13:29 -05:00
Anewbe
7f84aeab9f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool
2018-08-02 22:35:14 -05:00
Anewbe
729ce71aa0
Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format
2018-08-02 21:45:15 -05:00
Repede
2b21dbfd99
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
...
# Conflicts:
# config/custom_items.txt
# config/jobwhitelist.txt
# maps/tether/tether-05-station1.dmm
# maps/tether/tether-06-station2.dmm
2018-06-23 17:53:13 -04:00
Anewbe
f1c5978a32
Merge pull request #5343 from ReddeyfishVor/slimeChanges
...
prevent slimes from spawning on top of people
2018-06-11 14:11:28 -04:00
Anewbe
87929b51d0
Merge pull request #5343 from ReddeyfishVor/slimeChanges
...
prevent slimes from spawning on top of people
2018-06-11 13:10:24 -05:00
Repede
f772d7622c
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
2018-06-10 21:19:07 -04:00
Reddeyfish
0a616af465
prevent slimes from spawning on top of people
2018-06-10 11:42:42 -07:00
Repede
b83e867682
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
# code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
# code/modules/power/lighting.dm
2018-06-02 18:33:44 -04:00
Anewbe
7528ac54fb
Merge pull request #5305 from VOREStation/pol-autosay
...
Prevent autosay() from creating/deleting AIs
2018-06-02 12:47:27 -04:00
Aronai Sieyes
c5ded806f1
Merge pull request #3765 from VOREStation/aro-prottypefix
...
Fix prototype trait showing up
2018-05-27 21:21:22 -04:00
Arokha Sieyes
da2bb9567e
Prevent autosay() from creating/deleting AIs
...
Now it gets one dedicated AI it can move around instead.
2018-05-27 14:01:43 -04:00
Arokha Sieyes
31c7725066
Fix prototype trait showing up
2018-05-26 11:52:53 -04:00
Arokha Sieyes
6b42df0685
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
...
# Conflicts:
# code/__defines/misc.dm
# code/controllers/master_controller.dm
# code/game/machinery/computer3/computers/card.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/stacks/medical.dm
# code/game/objects/structures/signs.dm
# code/modules/admin/admin_verbs.dm
# code/modules/client/client defines.dm
# code/modules/client/client procs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/events/radiation_storm.dm
# code/modules/mining/machine_processing.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/mob.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_dispenser.dm
# config/example/config.txt
# html/changelogs/.all_changelog.yml
# interface/skin.dmf
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-05-25 13:23:47 -04:00
Repede
9e69f25327
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/_helpers/unsorted.dm
2018-05-13 21:08:22 -04:00
Aronai Sieyes
7334cd2638
Merge pull request #3623 from Verkister/flavormenu
...
Adds selectable sets of contamination flavors for bellies.
2018-05-08 11:26:34 -04:00
Leshana
86eac9c0b1
Implement rust-g library
2018-05-04 18:58:31 -04:00
Verkister
6821d3fcae
small fixes etc.
...
-Renamed the legacy flavor list from "all" to "generic"
-Added a few new/mode specific flavors.
-Rearranged the flavor lists into alphabetical order.
-Fixed a typo.
-Applied some suggested tweaks.
-Fixed oversight of the prey drop contamination not being updated for this.
-Fixed belly transfers not removing transfered items from source belly items_preserved list while at it.
2018-05-04 14:48:51 +03:00
Verkister
7b0bdccade
Adds selectable sets of contamination flavors for bellies.
...
-Divides item contamination flavors into categories to match better with the "belly" types.
-The selection menu shows up when itemweak mode is selected.
-The selection should save for each belly along with other prefs.
-The flavors have been cropped into following categories:
->All, contains the whole list as before apart from possible specific ones. Is the designated default option.
->Acrid, contains flavors implying regular nasty digestion.
->Dirty, contains flavors related to visual contamination.
->Musky, contains suggestively sloppy flavors without excess filth.
->Smelly, contains more airborne flavors without visual slop or crud.
->Wet, contains flavors of more neutral-ish soakage.
2018-05-01 13:34:42 +03:00
Neerti
be73b8c36a
for(var/bad_code in world)
...
Removes a very large amount of world loops.
Adds a macro to painlessly generate a global list, and the needed code to modify the list when an object is made or deleted automatically.
Cleans up some commented out code.
2018-04-29 17:55:04 -04:00
Spades
638a3f22d5
Merge pull request #3101 from VOREStation/aro-xen
...
[Pls Review] Xenochimera Cleanup
2018-04-28 10:48:19 -04:00
Repede
372e145108
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station/seromi.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
Fixed conflicts, fixed race racism money bs
2018-04-27 21:45:13 -04:00
Arokha Sieyes
7a6ff116a3
POLARIS: Varset Callback
2018-04-27 20:05:11 -04:00
kcin2001
0b4507f333
Merge branch 'master' into herms
2018-04-27 17:00:09 -07:00
kcin2001
51cd8636be
Adding herms all the way
2018-04-27 15:53:37 -07:00
Arokha Sieyes
6c686e6a2f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
...
# Conflicts:
# README.md
# code/game/jobs/job/job.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/mob/living/carbon/human/examine.dm
# code/modules/mob/living/carbon/human/npcs.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/Academy.dmm
# maps/RandomZLevels/beach.dmm
# maps/RandomZLevels/blackmarketpackers.dmm
# maps/RandomZLevels/challenge.dmm
# maps/RandomZLevels/example.dmm
# maps/RandomZLevels/jungle.dmm
# maps/RandomZLevels/listeningpost.dmm
# maps/RandomZLevels/spacebattle.dmm
# maps/RandomZLevels/stationCollision.dmm
# maps/RandomZLevels/wildwest.dmm
# maps/RandomZLevels/zresearchlabs.dmm
# maps/northern_star/polaris-1.dmm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# maps/southern_cross/southern_cross-7.dmm
# maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
# maps/submaps/surface_submaps/plains/Boathouse.dmm
# maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
# maps/submaps/surface_submaps/wilderness/Boombase.dmm
# maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
# maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
# maps/submaps/surface_submaps/wilderness/Drugden.dmm
# maps/submaps/surface_submaps/wilderness/Rockybase.dmm
# maps/submaps/surface_submaps/wilderness/Shack1.dmm
# maps/virgo/virgo-6.dmm
# vorestation.dme
2018-04-25 17:23:33 -04:00
Repede
95a1fade33
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/clothing/gloves/miscellaneous_vr.dm
# code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
# code/modules/vore/appearance/sprite_accessories_vr.dm
# code/modules/vore/eating/bellymodes_vr.dm
# config/custom_items.txt
# config/example/motd.txt
# icons/mob/human_face_or_vr.dmi
# icons/mob/vore/taurs_vr.dmi
# vorestation.dme
2018-04-20 09:03:58 -04:00
Arokha Sieyes
2cba96cf4c
Switch to defines for custom species stuff
2018-04-19 19:34:10 -04:00
Arokha Sieyes
1a349f77dd
Cleans up custom species icon base code
...
Fixes #3478
2018-04-19 17:46:51 -04:00
Reddeyfish
bbcd0f24e0
Add several new events
2018-04-13 18:03:42 -07:00
Leshana
33357bdd3e
Fix allowing frames on walls with machine-under-construction on it already.
...
Add /object/structure/frame to the list of objects that count as wall items. Also convert from strings to actual type paths.
... and fix the paths that haven't existed for four years. Properly speaking it should be a dynamically generated list at some point.
2018-04-11 23:14:04 -04:00
Leshana
a6a396181e
Fix allowing frames on walls with machine-under-construction on it already.
...
Add /object/structure/frame to the list of objects that count as wall items. Also convert from strings to actual type paths.
... and fix the paths that haven't existed for four years. Properly speaking it should be a dynamically generated list at some point.
2018-04-11 21:52:32 -04:00
Arokha Sieyes
a6cfbc4f42
Initial cleanup/changes
2018-04-02 16:36:04 -04:00
Anewbe
092b0f28a3
Revert "Fixes cameras making completely black photos"
2018-03-24 17:42:36 -05:00
Repede
7c6aadd829
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/datums/supplypacks/munitions.dm
# code/datums/supplypacks/security.dm
# code/game/area/Space Station 13 areas.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# code/modules/vore/fluffstuff/custom_guns_vr.dm
2018-03-23 20:25:18 -04:00
Neerti
092a4331a3
Merge pull request #5091 from drexample/master
...
Fixes cameras making completely black photos
2018-03-23 18:44:52 -04:00
Drexian
617aa580d9
added slashes. No idea for what, but I don't want anyone to ask me to do it because they have OCD
2018-03-23 22:54:13 +03:00
Drexian
c25fa6dea2
absolute pathing
2018-03-23 22:52:05 +03:00
Neerti
e0c0bacefb
Merge pull request #5084 from VOREStation/port-tooltips
...
Tooltip framework + Mob tooltips
2018-03-22 22:33:49 -04:00
Drexian
02aa2c126c
Camera fix
2018-03-22 03:39:16 +03:00
Arokha Sieyes
c492d1a21b
POLARIS: Clean up adminpm logs
2018-03-21 14:28:48 -04:00
Arokha Sieyes
de6da4a86c
POLARIS: Tooltip framework, and mob tooltips
2018-03-20 22:42:16 -04:00
Neerti
70ac478aea
Merge pull request #5065 from VOREStation/vs-port-3204
...
[PORT] Revamp logging for consistency
2018-03-20 21:13:47 -04:00
Repede
4a718e5968
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-03-16 17:46:59 -04:00
Leshana
d3c350a4db
Merge branch 'master' into polaris-sync-2018-03-15
2018-03-16 14:23:12 -04:00
Leshana
2a72489efd
Merge pull request #3226 from VOREStation/aro-reducedouble
...
Reduce double admin logs
2018-03-16 01:14:27 -04:00
Leshana
a0de41f24f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
...
# Conflicts:
# README.md
# code/__defines/mobs.dm
# code/__defines/subsystems.dm
# code/_helpers/global_lists.dm
# code/controllers/subsystems/garbage.dm
# code/controllers/subsystems/overlays.dm
# code/datums/datacore.dm
# code/datums/supplypacks/munitions.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/weapons/id cards/station_ids.dm
# code/game/objects/random/random.dm
# code/game/turfs/simulated/floor.dm
# code/game/turfs/simulated/floor_icon.dm
# code/modules/awaymissions/gateway.dm
# code/modules/client/preferences.dm
# code/modules/ext_scripts/python.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_defines.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/mob_helpers.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/mob/new_player/preferences_setup.dm
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/organs/organ_external.dm
# code/modules/organs/organ_icon.dm
# code/modules/organs/robolimbs.dm
# code/modules/reagents/reagent_containers/glass.dm
# code/modules/reagents/reagent_containers/syringes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-4.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-03-15 22:41:14 -04:00
Anewbe
5212fa152b
Species names should now use defines
2018-03-15 20:24:45 -05:00
Repede
26d570b470
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/multiz/pipes.dm
# config/custom_items.txt
2018-03-14 18:23:53 -04:00
Arokha Sieyes
32689067ba
POLARIS: Readd include_name param on keyname because it's used for other things
2018-03-13 18:58:16 -04:00
