izac112
87ce13b27c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2
2024-12-04 15:17:00 +01:00
izac112
058f219cb9
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-11-30 23:30:26 +01:00
Kashargul
49d89c0059
usr to user up to player effects
2024-11-12 00:10:20 +01:00
Kashargul and GitHub
b594520a74
next set of spans ( #16434 )
...
* next set of spans
* some more
* next
* next
* next
* .
* text...
* next... rest soon
* .
* .
* ok last set for the night
* .
* .
* .
* .
* some more
* next
* next
* all for now
* .
* some more easy ones
* some more easy ones
* .
* .
* some more bolds
* oups auto complete moment
* add the remaining spans
* this as well
* this as well
* .
* .,
* resync them properly
2024-10-16 23:37:27 +02:00
Kashargul
e0d694e8ac
rid of old span macros
2024-10-01 23:51:48 +02:00
Guti
409aaba802
Remove
2024-09-09 02:36:53 +02:00
izac112
42b345b3cc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-08-28 20:22:38 +02:00
Killian and GitHub
dcbb48814b
signs and safety ( #16136 )
2024-08-01 15:57:02 +10:00
Drathek and GitHub
7c8bb85de3
Whitespace Standardization [MDB IGNORE] ( #15748 )
...
* Update settings
* Whitespace changes
* Comment out merger hooks in gitattributes
Corrupt maps would have to be resolved in repo before hooks could be updated
* Revert "Whitespace changes"
This reverts commit afbdd1d8442973f5d570c30920d9d865b5acd479.
* Whitespace again minus example
* Gitignore example changelog
* Restore changelog merge setting
* Keep older dmi hook attribute until hooks can be updated
* update vscode settings too
* Renormalize remaining
* Revert "Gitignore example changelog"
This reverts commit de22ad375d3ee4d5930c550da2fd23a29a86e616.
* Attempt to normalize example.yml (and another file I guess)
* Try again
2024-02-20 11:28:51 +01:00
izac112
a17d96cb92
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-10-30 11:24:00 +01:00
Heroman
9a94306585
Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one
2023-10-01 09:34:43 +10:00
izac112
4088f40cc9
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-08-24 18:27:07 +02:00
Selis
271ff9408f
Spell Fixes
2023-06-18 12:47:36 +02:00
izac112
4cc81d7c73
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-03-19 22:24:48 +01:00
Killian
e804b87b00
shuttle bay signs
2023-03-16 17:28:20 +00:00
Heroman3003 and GitHub
e7ebe8c0bd
Update signs.dm
2023-03-13 15:05:39 +10:00
Cerebulon and VirgoBot
19715ab471
/tg/ era language pass
2023-02-25 02:34:24 -05:00
izac112
53f54d78e6
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-01-03 21:12:41 +01:00
Atermonera and VirgoBot
d950e35905
Greenjoe12345/xmas2022
2022-12-13 22:02:58 -05:00
izac112
dc36fe9b8f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-10-16 22:52:41 +02:00
C.L and GitHub
304e6b960e
Fixes icon_states, swaps to initialize(), adds original_sign
2022-10-07 22:33:36 -04:00
C.L and GitHub
b05a3491d7
Update signs.dm
2022-10-07 22:27:38 -04:00
C.L and GitHub
80d85e969c
Update signs.dm
2022-10-07 22:26:01 -04:00
Spookerton and VirgoBot
c537bec138
A -ton of Flags
2022-10-07 16:10:11 -04:00
Novacat and GitHub
1aa4c73e8d
Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]"
2022-08-27 08:49:56 -04:00
IgnusVam
98ba6e9e84
Small tweaks
...
Reduced belts in mining to 1.
Annotation improvements.
Moved YW signage to its own file.
2022-02-14 10:45:53 -07:00
IgnusVam
ca690d5dee
Map changes, lighting, new janitor sign, major fix to sec armory.
...
- New plant in cargo (grinch stole the old one)
- Fixed misplaced doors in engineering.
- Added lights in: Cargo, cargo hallway, security staircase, warden hallway, green armory, medical EMT, security airlock.
- Fixed typo in drone pod crash event.
- Added a power cell charger in mining
- Added janitor department sign, placed appropriately.
- Moved frostlamp outside teleporter airlock, shouldn't wander inside as much.
- Removed binocs in mining, replaced with belts.
- Adjusted Blue armory and Engineering tool storage to greatly increase wall security.
- Fixed a triplet of scrubbers and vents in engineering tool storage.
- Removed atmos pipes that led into walls.
2022-02-13 21:54:44 -07:00
MistakeNot4892 and VirgoBot
3f9af78f3a
/atom New() => Initialize() [MDB IGNORE]
2021-11-14 03:09:51 -05:00
Cerebulon and VirgoBot
bbceed6af4
Sign Oh Sure
2021-07-24 13:22:47 -04:00
577b986ba6
Convert some bools to TRUE/FALSE instead of 1/0. ( #11100 )
...
Co-authored-by: Aronai Sieyes <arokha@arokha.com >
2021-07-16 13:43:25 -04:00
Aronai Sieyes
4c12504e3b
Replace list inputs with tgui_input_list
2021-06-26 10:39:56 -04:00
Killian and Unknown
e54408ea3f
mergefix
2021-01-06 14:58:41 -05:00
Killian and Unknown
7f9d486e69
Directional Signs Update
2021-01-06 14:56:50 -05:00
Heroman3003
e3e715454b
Makes placeholder entries for lore writing
2019-04-23 11:13:42 +10:00
Neerti and Novacat
91a5203e32
Adds New PoI Features + Bonus PoI
2019-03-27 12:15:50 -04:00
Arokha Sieyes
b099ac6e4c
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
...
# Conflicts:
# code/__defines/holomap.dm
# code/__defines/mobs.dm
# code/_helpers/icons.dm
# code/_helpers/unsorted.dm
# code/_onclick/hud/hud.dm
# code/_onclick/item_attack.dm
# code/controllers/Processes/supply.dm
# code/controllers/subsystems/planets.dm
# code/datums/supplypacks/munitions.dm
# code/datums/supplypacks/science.dm
# code/datums/supplypacks/security.dm
# code/datums/supplypacks/supply.dm
# code/game/area/Space Station 13 areas.dm
# code/game/atoms_movable.dm
# code/game/machinery/autolathe.dm
# code/game/machinery/doors/door.dm
# code/game/machinery/jukebox.dm
# code/game/machinery/recharger.dm
# code/game/machinery/vending.dm
# code/game/mecha/equipment/tools/medical_tools.dm
# code/game/mecha/equipment/weapons/weapons.dm
# code/game/objects/items/devices/PDA/PDA.dm
# code/game/objects/items/devices/megaphone.dm
# code/game/objects/items/poi_items.dm
# code/game/objects/items/weapons/implants/implantlanguage.dm
# code/game/objects/items/weapons/storage/firstaid.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/objects/structures/flora/trees.dm
# code/game/objects/structures/plasticflaps.dm
# code/game/supplyshuttle.dm
# code/game/turfs/simulated/wall_attacks.dm
# code/modules/admin/admin_verbs.dm
# code/modules/assembly/infrared.dm
# code/modules/client/client procs.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/client/preferences.dm
# code/modules/clothing/suits/miscellaneous.dm
# code/modules/holomap/holomap_datum.dm
# code/modules/holomap/station_holomap.dm
# code/modules/integrated_electronics/core/printer.dm
# code/modules/mining/machine_processing.dm
# code/modules/mob/living/carbon/human/human_defense.dm
# code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
# code/modules/mob/living/death.dm
# code/modules/mob/living/silicon/ai/ai.dm
# code/modules/mob/living/silicon/pai/pai.dm
# code/modules/mob/living/silicon/robot/robot.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/mob_movement.dm
# code/modules/organs/organ_external.dm
# code/modules/organs/organ_icon.dm
# code/modules/organs/subtypes/standard.dm
# code/modules/planet/weather.dm
# code/modules/power/cable.dm
# code/modules/power/fusion/core/core_control.dm
# code/modules/power/fusion/fuel_assembly/fuel_control.dm
# code/modules/power/fusion/gyrotron/gyrotron_control.dm
# code/modules/projectiles/gun.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
# config/names/first_name_skrell.txt
# config/names/last_name_skrell.txt
# icons/mob/head.dmi
# icons/mob/robots.dmi
# icons/mob/species/tajaran/helmet.dmi
# icons/obj/ammo.dmi
# icons/obj/gun.dmi
# icons/obj/mining.dmi
# icons/obj/projectiles.dmi
# icons/obj/rig_modules.dmi
# icons/obj/surgery.dmi
# icons/turf/walls.dmi
# 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-8.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
# maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
# maps/submaps/surface_submaps/mountains/deadspy.dmm
# maps/submaps/surface_submaps/mountains/mountains_areas.dm
# maps/submaps/surface_submaps/plains/Thiefc.dmm
# maps/~map_system/maps.dm
# vorestation.dme
2018-09-27 18:01:09 -04:00
Anewbe
729ce71aa0
Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format
2018-08-02 21:45:15 -05: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
Anewbe
7e44e95d24
Corrects some plane and layer issues
2018-05-20 18:41:21 -05:00
Arokha Sieyes
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
Arokha Sieyes
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
Very-Soft
5715e58691
Adds signs and bones to the underdark!
2018-04-28 23:31:05 -04:00
Leshana
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
Aronai Sieyes and Atermonera
7d3aec96fd
Arranges lots of things into planes ( #5072 )
...
* Rearranges a billion things into planes
* Make cryotubes fancy
* Update Travis
* Fix hiding logic
2018-03-28 12:59:12 -07:00
Leshana
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
Woodratt
ed29353021
Further Map Fixes and Adjustments
...
- Deck 3 Port Airlock fixed
- Vent added to cargo delivery office to fix over pressure
- Windoor in Robotics given proper access and named
- Parachute crate added to pilot areas
- Access around cargo made more consistent
- Fixed first deck starboard hallway area
- Pilots now have access to maintenance around the hangars
- More ATMs added
- Center door on bridge removed
- Open sign from Bar borrowed for cafeteria as well
- Critical addition, Dog bed in HoP office
- Fixed T-comms turrets yet again
- Adjustments to engine room allowing for a second set of TEGs to properly be set up (Thanks to Kerbal/Mazian). Also moved vent control to a different position to stop a certain headmin from repeatedly hitting it
2018-01-31 05:11:23 -08:00
Cerebulon and Atermonera
ebc855e1fb
Added Decoupled starship engine PoI ( #4649 )
2018-01-28 01:08:40 -08:00
Arokha Sieyes
d998f36c38
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018
...
# Conflicts:
# code/game/objects/structures/signs.dm
# code/modules/mob/living/carbon/human/human.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/organs/organ_icon.dm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2017-12-26 23:07:58 -05:00
Woodratt
ed9395e58f
SC Stupid Sized Map Update
...
Or how Woodrat spent too long on something that was supposed to be simple.
- Addition of a Explorer Radio Channel and headsets.
- Explorers and Search and Rescue job slots added
- Adjustments to the pilot job including getting rid of the flatcap
- Map fixes, adjustments, (including signs pointing to cryo) planetside side map additions splitting up of the wilderness into two area sections
- Disabled lighting on the arrivals shuttle area once it is docked with the station, should help with the whole issue of lighting bugging out and having dark space
- Fixed EMS jacket missing icons
- Fixed Research signs being missing for some reason, addition of directional signs for cryo
- Addition of a Search and Rescue Winter coat
- Probably a dozen other small bug fixes I forgot, and bug additions
Tested, seems fine. At least in short tests.
2017-12-24 07:04:34 -08:00
killer653
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
izac112