febedc2302
Merge pull request #128 from ReddeyfishVor/slimeChange
...
prevent slimes from spawning on top of players
2018-05-21 00:11:37 -07:00
813d7bf643
Merge branch 'virgoMaster' into virgoPull
2018-05-19 17:16:17 -07:00
7334cd2638
Merge pull request #3623 from Verkister/flavormenu
...
Adds selectable sets of contamination flavors for bellies.
2018-05-08 11:26:34 -04:00
86eac9c0b1
Implement rust-g library
2018-05-04 18:58:31 -04:00
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
5de9c8e1d8
prevent slimes from spawning on top of players
2018-05-02 20:05:56 -07:00
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
1c1ab01a69
Merge branch 'virgoMaster' into virgoPull
2018-04-28 10:12:34 -07:00
638a3f22d5
Merge pull request #3101 from VOREStation/aro-xen
...
[Pls Review] Xenochimera Cleanup
2018-04-28 10:48:19 -04:00
7a6ff116a3
POLARIS: Varset Callback
2018-04-27 20:05:11 -04:00
0b4507f333
Merge branch 'master' into herms
2018-04-27 17:00:09 -07:00
51cd8636be
Adding herms all the way
2018-04-27 15:53:37 -07:00
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
2cba96cf4c
Switch to defines for custom species stuff
2018-04-19 19:34:10 -04:00
1a349f77dd
Cleans up custom species icon base code
...
Fixes #3478
2018-04-19 17:46:51 -04:00
0af8620ee1
Merge branch 'virgoMaster' into virgoPull
2018-04-15 11:06:40 -07:00
bbcd0f24e0
Add several new events
2018-04-13 18:03:42 -07:00
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
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
b3fe83f4d3
New events, broken windows and doors ( #102 )
...
* Add electrified door event
* Add more verbose announcement to wallrot
* Add window breaking event
* Add window breakage to event rotation
2018-04-06 09:35:13 -07:00
a6cfbc4f42
Initial cleanup/changes
2018-04-02 16:36:04 -04:00
4909f3f22b
Add trash-edible glass container ( #83 )
...
* Add trash-edible glass container
* Refactor to clearer item path, add flavortext
* Add autolathe cost
2018-03-31 11:11:09 -07:00
092b0f28a3
Revert "Fixes cameras making completely black photos"
2018-03-24 17:42:36 -05:00
092a4331a3
Merge pull request #5091 from drexample/master
...
Fixes cameras making completely black photos
2018-03-23 18:44:52 -04:00
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
c25fa6dea2
absolute pathing
2018-03-23 22:52:05 +03:00
e0c0bacefb
Merge pull request #5084 from VOREStation/port-tooltips
...
Tooltip framework + Mob tooltips
2018-03-22 22:33:49 -04:00
ace0058b1f
Merge branch 'virgoMaster' into virgoPull
2018-03-21 21:22:51 -07:00
02aa2c126c
Camera fix
2018-03-22 03:39:16 +03:00
c492d1a21b
POLARIS: Clean up adminpm logs
2018-03-21 14:28:48 -04:00
67857af3de
IRC bot attempt 2! Electric Boogaloo
2018-03-21 14:49:39 +00:00
de6da4a86c
POLARIS: Tooltip framework, and mob tooltips
2018-03-20 22:42:16 -04:00
70ac478aea
Merge pull request #5065 from VOREStation/vs-port-3204
...
[PORT] Revamp logging for consistency
2018-03-20 21:13:47 -04:00
d3c350a4db
Merge branch 'master' into polaris-sync-2018-03-15
2018-03-16 14:23:12 -04:00
2a72489efd
Merge pull request #3226 from VOREStation/aro-reducedouble
...
Reduce double admin logs
2018-03-16 01:14:27 -04:00
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
5212fa152b
Species names should now use defines
2018-03-15 20:24:45 -05:00
32689067ba
POLARIS: Readd include_name param on keyname because it's used for other things
2018-03-13 18:58:16 -04:00
7f93f3cca7
POLARIS: Moves daily logs into being folders rather than files
2018-03-13 18:20:59 -04:00
73838e0a62
POLARIS: Revamp logging to be consistent
2018-03-13 18:20:58 -04:00
b68a943443
POLARIS: Clean up adminpm logs
2018-03-13 10:25:29 -04:00
de9a37495c
Merge pull request #3225 from VOREStation/aro-tooltips
...
Tooltip framework + Mob tooltips
2018-03-12 21:28:06 -04:00
2f0ab06a25
Merge pull request #3223 from VOREStation/aro-fixadmpm
...
Readd include_name param on key_name because it's used
2018-03-12 18:38:09 -04:00
428db6c271
POLARIS: Tooltip framework, and mob tooltips
2018-03-12 18:25:53 -04:00
bcf962fc32
POLARIS: Readd include_name param on keyname because it's used for other things
2018-03-12 11:33:58 -04:00
9f56416684
Merge pull request #5037 from VOREStation/aro-updateicons
...
Rewrite human/update_icons()
2018-03-11 21:03:10 -05:00
ef37b4b307
VS: HTMLDecode vorestation log types
2018-03-10 21:27:37 -05:00
fae2b48eab
POLARIS: Moves daily logs into being folders rather than files
2018-03-10 17:18:55 -05:00
46f4022852
VS: Consistent logging changes to match polaris commit
2018-03-10 17:18:09 -05:00
2c9bdf3ae4
POLARIS: Revamp logging to be consistent
2018-03-10 17:18:09 -05:00
ReddeyfishVor