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
Arokha Sieyes
7f93f3cca7
POLARIS: Moves daily logs into being folders rather than files
2018-03-13 18:20:59 -04:00
Arokha Sieyes
73838e0a62
POLARIS: Revamp logging to be consistent
2018-03-13 18:20:58 -04:00
Arokha Sieyes
b68a943443
POLARIS: Clean up adminpm logs
2018-03-13 10:25:29 -04:00
Aronai Sieyes
de9a37495c
Merge pull request #3225 from VOREStation/aro-tooltips
...
Tooltip framework + Mob tooltips
2018-03-12 21:28:06 -04:00
Aronai Sieyes
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
Arokha Sieyes
428db6c271
POLARIS: Tooltip framework, and mob tooltips
2018-03-12 18:25:53 -04:00
Arokha Sieyes
bcf962fc32
POLARIS: Readd include_name param on keyname because it's used for other things
2018-03-12 11:33:58 -04:00
Anewbe
9f56416684
Merge pull request #5037 from VOREStation/aro-updateicons
...
Rewrite human/update_icons()
2018-03-11 21:03:10 -05:00
Repede
3366ab9769
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-03-10 21:49:15 -05:00
Arokha Sieyes
ef37b4b307
VS: HTMLDecode vorestation log types
2018-03-10 21:27:37 -05:00
Arokha Sieyes
fae2b48eab
POLARIS: Moves daily logs into being folders rather than files
2018-03-10 17:18:55 -05:00
Arokha Sieyes
46f4022852
VS: Consistent logging changes to match polaris commit
2018-03-10 17:18:09 -05:00
Arokha Sieyes
2c9bdf3ae4
POLARIS: Revamp logging to be consistent
2018-03-10 17:18:09 -05:00
Arokha Sieyes
96b0416c7f
U_I Phase 2.3: Further cleanup
2018-03-08 19:34:00 -05:00
Arokha Sieyes
53a185f838
U_I Phase 2.0: Code cleanup
...
Removing calls to update_icons_layers and the like, stubbing them to help track down future calls.
2018-03-08 19:33:44 -05:00
Arokha Sieyes
62e0c122fa
U_I Phase 1.4: More preview fixes, not done yet
2018-03-08 19:31:56 -05:00
Arokha Sieyes
aa9ec19118
U_I Phase 1.0: First consolidation pass
2018-03-08 19:31:43 -05:00
Anewbe
7ed36f51f2
Syringe adjustments
2018-03-07 18:46:50 -06:00
Repede
46577b7321
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/mecha/combat/gorilla.dm
# code/modules/vore/eating/bellymodes_vr.dm
2018-03-06 18:11:39 -05:00
Leshana
741e02407a
Port SSoverlays & Convert turfs to use it ( #5004 )
...
* Added "Display Initialize() Log" admin debug command so you can see it mid-round.
* Ported the core of the overlays management subsystem from /tg
- Added SSoverlays subsystem for compiling overlay lists and applying them to atoms in a controlled anti-lag subsystem.
- Added vars and procs to atom which should eventually replace all direct interaction with BYOND's /atom/overlays var outside the subsystem.
- Added OVERLAY_QUEUED flag to var/atom/flags bitfield.
- Added small framework for subsystem performance tracking. So far used only by SSoverlays
- Added admin debug command "Display overlay Log" to see performance stats mid-round.
* Fix runtime on universal pipe adaptor update_icons
* Workaround for appearance_bro not initialized
Unfortuantely BYOND's initialization order is strange, and the appearance_bro var is only half initialized when map starts to load, causing errors. We temporarily fix by moving it to be a global-scoped global.
* Convert fire alarms to use add_overlay() A good first test.
* Convert turfs to use add_overlays(), eliminating the turf_overlay_holder!
- Converted as much as I could find about turf overlays to use add_overlay().
- This should be enough to stop BYOND from crashing, so we can eliminate the turf_overlay_holder hack.
- This also lets us remove the anti-corruption hacks from walls and open space.
- ZAS gas overlays can use priority overlays, so this also fixes the gas-goes-away-when-crowbarring-plating issue.
- Stuff like that
* Convert turf overlay interactions to use add_overlay.
Note: This is a plain and simple conversion of existing code to use SSoverlays. However I look at the line changed, and note that that line likely never fully worked as intended, as it has no way of re-applying itself.
I would make it use a priority overlay, but there is no code present for *removing* said overlay from neighbors when it is no longer required. That code should be implemented by original author.
2018-03-05 19:43:23 -06:00
