7601c29d89
Timeclock Fixes
...
Fixes time left output as well as for when the timeclock announces the wrong position when it was an alternate title, etc.: https://github.com/VOREStation/VOREStation/pull/5434
2019-07-26 10:15:15 -04:00
beba47a3e1
Timeclock Usage Upgrade
...
Allows you to switch to off-duty mid-round and, depending on whether there's an HOP, back on duty with non-command level jobs available.
2019-05-19 16:16:35 -04:00
bff9f560f7
Replaced all blue font with a custom colour
2019-01-18 15:14:32 +00:00
9952e2cd9c
Adjusted ahelp colors
2018-12-22 14:45:14 +00:00
2fba824a89
Merge pull request #5310 from Heroman3003/arcade-fix
...
Fixed arcades dispensing their own board
2018-05-31 21:33:20 -04:00
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
bdfa34c911
SSAO object excludes
...
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
2018-05-14 11:54:10 -04:00
91f0c05a4b
SSAO object excludes
...
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
2018-05-14 11:38:22 -04:00
c032a297da
Tenth time's the charm. Fix upload console runtimes by passing module.install user.
2018-05-02 19:00:17 -07:00
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
e08cbef044
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04
...
# Conflicts:
# code/modules/economy/lorenews.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
2018-04-06 15:40:06 -04:00
6756c5a483
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
...
# Conflicts:
# .travis.yml
# code/ATMOSPHERICS/components/unary/outlet_injector.dm
# code/__defines/_planes+layers.dm
# code/__defines/chemistry.dm
# code/__defines/mobs.dm
# code/_helpers/mobs.dm
# code/_onclick/hud/robot.dm
# code/game/area/areas.dm
# code/game/machinery/computer/supply.dm
# code/game/machinery/cryopod.dm
# code/game/machinery/doors/airlock.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/devices/communicator/messaging.dm
# code/game/sound.dm
# code/game/supplyshuttle.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/modules/admin/admin.dm
# code/modules/client/preference_setup/occupation/occupation.dm
# code/modules/events/event_container.dm
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/language/language.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/human_powers.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/species_shapeshift.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_powers.dm
# code/modules/mob/living/say.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/logout.dm
# code/modules/mob/mob_helpers.dm
# code/modules/organs/organ.dm
# code/modules/organs/organ_icon.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_containers/syringes.dm
# code/modules/shuttles/shuttle.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/wildwest.dm
# maps/southern_cross/items/clothing/sc_head.dm
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-03-31 09:20:59 -04:00
545cc15849
Adds a message on emag to the battle arcade machine. ( #5129 )
...
* Updates one arcade machine emag message to to_chat, adds another.
* Returns 1 in emag_act for orion trail.
* Converts a bunch of stuff to macros. Should probably not break anything.
* Fixes an improper macro usage.
* Attempts to fix all 20 errors.
2018-03-30 19:36:45 -05:00
ebeb513b31
Ports export reports ( #5051 )
...
* Ports export reports
* Absolute pathing, small touchups
2018-03-20 23:39:06 -07:00
73838e0a62
POLARIS: Revamp logging to be consistent
2018-03-13 18:20:58 -04:00
2c9bdf3ae4
POLARIS: Revamp logging to be consistent
2018-03-10 17:18:09 -05:00
68a5fabe11
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/game/objects/items/devices/translator.dm
# code/game/objects/items/weapons/dna_injector.dm
# code/modules/client/preference_setup/loadout/loadout_ears.dm
# code/modules/mob/living/simple_animal/aliens/hivebot.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-3.dmm
2018-03-03 13:09:57 -05:00
36236e1883
Sivian Western Sprite Pack ( #4970 )
...
* Adds: flamenco dress, bustle dress, cowboy duster, sheriff badge, tiny cowboy hat. To be added: 2 pairs of cowboy boots, stick horse.
* Adds 2 cowboy boots and a stick horse. yeehaw.
* Attempting to squash conflict that was caused by one of my OWN prs. For shame.
* attempting to fix conflict ft. anewbe
2018-02-27 14:24:20 -06:00
243ce6ddca
Maps in timeclocks
2018-02-24 12:05:15 -05:00
31b8e30aac
Adds Timeclock Terminals: A machine for viewing your PTO balance.
...
* Timeclock machine and NanoUI template.
* Circuit board for construction.
* Frame datum for construction on walls.
* Sprites by VerySoft
2018-02-18 20:42:22 -05:00
7ed3d2c2f6
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
...
# Conflicts:
# code/_onclick/hud/screen_objects.dm
# code/game/objects/items/weapons/storage/storage.dm
# code/game/objects/structures/crates_lockers/closets/secure/medical.dm
# code/modules/admin/admin_verbs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/gloves/color.dm
# code/modules/lore_codex/codex.dm
# code/modules/mob/living/simple_animal/aliens/alien.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/goose.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/mob_defines.dm
# code/modules/projectiles/projectile/special.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-7.dmm
# vorestation.dme
2018-02-17 00:35:29 -05:00
02447e5c19
The largest PR I've probably actually done. Adds the following:
...
* Bouquets
* Fake Bouquets. Can be won from arcade machines.
* Heart box chocolates containing a set arrangement of chocolates.
* Adds said chocolates (milk chocolate, white chocolate, and truffles) all bite-sized.
* Adds 5 cards, one blank and four with covers. Function identical to paper except you can't make an airplane because I hate fun.
* Adds The four cards with covers, 3 real bouquets, and 2 chocolate boxes to cargo under a 'gift crate' for 10 points.
Sprites by me. Code would not be possible without cerebul's help. Let me know if I've goofed on something, but I did test all of the items + ordering them from cargo.
2018-02-15 03:33:23 -06:00
f741bba7cb
Fix IDs so they do not instantiate every job datum on New
...
Every ID was instantiatating and deleting a copy of *every* job datum in its New(). Thats silly. Switch to initialize so job_master is available.
2018-02-07 16:38:37 -05:00
5847319443
Update every initialize() proc to return an initialize hint.
...
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-05 15:50:13 -05:00
cef001bf2a
Update every initialize() proc to return an initialize hint.
...
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-03 01:00:57 -05:00
4f98fad36b
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01
...
# Conflicts:
# .travis.yml
# code/_away_mission_tests.dm
# code/modules/admin/verbs/mapping.dm
# code/modules/mob/living/carbon/human/update_icons.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-6.dmm
# nano/images/nanomap_z1.png
# nano/images/nanomap_z10.png
# nano/images/nanomap_z2.png
# nano/images/nanomap_z3.png
# nano/images/nanomap_z5.png
# nano/images/nanomap_z6.png
2018-02-01 23:55:47 -05:00
44b8b6f5ce
ID computer can now assign planetside jobs, command secretary, IAA ( #4665 )
...
* ID computer can now assign planetside jobs
* Command Secretary and IAA on the menu
* Command secretary has keycard auth. access
* And normal access
2018-01-31 14:13:12 -06:00
27c3272821
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
...
# Conflicts:
# code/ZAS/_docs.dm
# code/__defines/mobs.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/game/turfs/simulated/walls.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/lore_codex/codex.dm
# code/modules/mob/living/life.dm
# code/modules/mob/living/living_defines.dm
# 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/southern_cross/southern_cross_jobs.dm
# vorestation.dme
2018-01-27 23:08:53 -05:00
6df90c09e3
Allows Prometheans to be cloned from their Core. ( #4602 )
...
* Allows Prometheans to be cloned from their Core.
* Swap brain cloning dependency from the cloner to the brain itself.
* Fffffff Changelog. And to_chat.
2018-01-24 18:19:32 -06:00
882489911b
Added supply shuttle export reports
...
Added a new option to the cargo console to view supply points gained
from the most recent shuttle trip.
It breaks down the value per crate, but to preserve the fun of trial and
error for folks that enjoy that doesn't itemize exactly what inside the
crate provided that value.
Part of the supply shuttle changes could probably be instead done as a
sell_crate hook, but because of where that's called it would have to
duplicate all the manifest-detection code.
2018-01-08 20:28:47 -05:00
b9e8b9641c
Various and sundry admin messages
2018-01-06 19:15:54 -05:00
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
600bae5ac9
Update prisoner.dm
2017-12-11 11:25:50 -05:00
bff854690a
Update prisoner.dm
2017-12-02 23:47:35 -05:00
e3d64b516b
Update prisoner.dm
2017-12-02 23:44:12 -05:00
87c3979ef5
Fixes tracking implants
...
Credit to Aronai for finding it
2017-12-02 23:43:02 -05:00
af5c633cdb
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob
...
# Conflicts:
# code/game/atoms_movable.dm
2017-11-29 22:43:05 -05:00
acb208dd3f
Works on New Blob
2017-11-29 22:35:01 -05:00
17a5b70d38
Hacked borgs can no longer be locked down
2017-11-21 23:19:57 -06:00
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
e61efc752a
more gammers ( #4052 )
...
* Update medsci.dm
* Update miscellaneous.dm
* Update arcade.dm
* Update transform.dm
* Update implanter.dm
* Update shuttle_console.dm
2017-10-13 23:32:22 -05:00
15a6472d14
Pol Sync
2017-10-08 17:44:25 -04:00
23b0312af9
Merge pull request #3975 from Anewbe/no_clone
...
Adds a no_clone modifier
2017-10-01 13:29:25 -04:00
c47cc200d5
Makes guest passes great again!
2017-09-28 19:43:57 -04:00
9f651ba5f2
Adds a no_clone modifier
2017-09-28 16:26:24 -05:00
215c080b1e
Merge pull request #3438 from Neerti/5/9/2017_reopening_the_salt_mines
...
Adds Recently Cloned Modifier to Cloners
2017-09-26 19:09:12 -05:00
c80b535a29
Merge pull request #3902 from Neerti/9/19/2017_lost_drone
...
Adds the Lost Drone
2017-09-22 15:24:05 -05:00
afd7b15442
Adds the Lost Drone
2017-09-22 01:17:53 -04:00
2755d3ddb1
HOTFIX
2017-09-21 20:26:48 -04:00
61936496b1
Merge pull request #3813 from Belsima/clickityclack
...
Adds a metric assload of sounds.
2017-09-20 22:20:17 -05:00
TheFurryFeline