8fa48e2a3e
[MIRROR] Fixes map issues found in #18285 [MDB IGNORE] [IDB IGNORE] ( #11485 )
...
Co-authored-by: Cameron Lennox <killer65311@gmail.com >
2025-08-23 22:23:45 +02:00
f04f992cfe
[MIRROR] code/global.dm => code/_global_vars/ ( #10689 )
...
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2025-04-21 19:16:48 +02:00
f7219329ca
[MIRROR] Conversion many Globals to Managed Globals (Part 1) ( #10665 )
...
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2025-04-18 01:06:35 +02:00
46fc30e83e
[MIRROR] oups shuttles move ( #10563 )
...
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2025-03-31 15:01:07 +02:00
77fffaef2a
[MIRROR] Fixed broken signposts in fantasy redgate ( #9931 )
...
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com >
2025-01-26 16:20:24 +01:00
5ea698a0ef
[MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] ( #9084 )
...
Co-authored-by: Changelogs <action@github.com >
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com >
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com >
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
Co-authored-by: Kashargul <KashL@t-online.de >
2024-09-30 21:36:41 +02:00
f5ccf14fdf
[MIRROR] Event signs ( #8412 )
...
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com >
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com >
2024-05-19 00:53:27 +02:00
2f5d094cfa
[MIRROR] Jungle mobs ( #7996 )
...
Co-authored-by: Casey <a.roaming.shadow@gmail.com >
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com >
2024-03-18 08:36:42 +01:00
3995338290
Moar whitespace normalization [MDB IGNORE] ( #7750 )
...
Co-authored-by: Raeschen <rycoop29@gmail.com >
2024-02-16 10:54:47 +01:00
Casey and Chompstation Bot
13fe86a9ed
Merge pull request #11706 from GhostActual/dodgeball
...
Dodgeball+
2021-10-27 16:08:22 +00:00
Chompstation Bot
481c0e314e
Convert some bools to TRUE/FALSE instead of 1/0.
2021-07-16 17:44:40 +00:00
Chompstation Bot
b6e1989a01
The One Where I Port Modals
2021-06-30 19:29:34 +00:00
Chompstation Bot
fb343cec6c
[MIRROR] Linter diagnostics + bans non-var relative pathing
2021-06-22 22:17:02 +00:00
izac112
4b051c23fc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-13 15:05:53 +02:00
Rykka
d2fb9a7691
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
Repede
3f4f33bbd8
Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates
...
# Conflicts:
# code/modules/mob/living/carbon/human/emote_vr.dm
2020-05-18 20:30:52 -04:00
Aronai Sieyes
e3b5d24c8b
Obsolete the PROXMOVE flag and uses
2020-05-18 13:31:54 -04:00
izac112
e28994b7be
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
...
All conflicts resolved
Signed-off-by: izac112 <izac10@live.com >
2020-05-06 21:53:03 +02:00
Aronai Sieyes
62e5d5a413
Refactor client/Move
2020-04-30 15:46:51 -04:00
Repede
e44e346352
Release Update
...
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
# Conflicts:
# code/__defines/machinery.dm
# code/controllers/configuration.dm
# code/game/jobs/jobs.dm
# code/game/machinery/doors/blast_door.dm
# code/game/machinery/pipe/pipe_recipes.dm
# code/game/objects/items/devices/radio/radio_vr.dm
# code/modules/client/preferences_vr.dm
# code/modules/clothing/glasses/hud_vr.dm
# code/modules/clothing/under/accessories/accessory_vr.dm
# code/modules/events/event_container_vr.dm
# code/modules/gamemaster/actions/planet_weather_change.dm
# code/modules/projectiles/guns/energy/netgun_vr.dm
# code/modules/projectiles/guns/energy/protector_vr.dm
# code/modules/vore/appearance/sprite_accessories_taur_vr.dm
# code/modules/vore/appearance/sprite_accessories_vr.dm
# code/modules/vore/fluffstuff/custom_guns_vr.dm
# icons/obj/power.dmi
# vorestation.dme
2020-04-16 21:07:33 -04:00
Aronai Sieyes
f8d920fd02
Allow 'offmap spawn' jobs to be isolated from station employees
2020-04-11 12:03:10 -04:00
Repede
7f1a6d6cc7
Fuck this shit
...
Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
# code/controllers/autotransfer.dm
# code/controllers/subsystems/inactivity.dm
# code/game/area/Away Mission areas.dm
# code/game/area/Space Station 13 areas.dm
# code/game/jobs/job/captain.dm
# code/game/jobs/job/civilian.dm
# code/game/jobs/job/security.dm
# code/game/jobs/jobs.dm
# code/game/machinery/air_alarm.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/machinery/suit_storage_unit_vr.dm
# code/game/mecha/combat/gorilla.dm
# code/game/turfs/simulated/dungeon/wall.dm
# code/game/turfs/simulated/wall_types.dm
# code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
# code/modules/clothing/spacesuits/void/void_vr.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/mob/language/station_vr.dm
# code/modules/mob/living/carbon/human/emote_vr.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
# code/modules/mob/new_player/sprite_accessories_vr.dm
# code/modules/power/apc.dm
# code/modules/power/lighting.dm
# code/modules/resleeving/machines.dm
# config/jobwhitelist.txt
# icons/mob/species/seromi/head.dmi
# icons/mob/species/seromi/suit.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# maps/tether/submaps/_tether_submaps.dm
# maps/tether/tether_areas2.dm
# maps/tether/tether_defines.dm
# maps/tether/tether_shuttles.dm
# nano/templates/apc.tmpl
# vorestation.dme
2020-04-04 14:37:55 -04:00
Unknown
a40df7dda7
Earlyports some bugfixes
2020-03-20 00:35:55 -04:00
Atermonera and VirgoBot
8d2b41ad2c
Big Bastard Incidental Sound Port
2020-03-15 14:39:19 -04:00
Neerti and VirgoBot
0d9345adde
Half-Refactors Jobs
2020-03-03 16:28:33 -05:00
RadiantFlash7
0d40994226
Fixes galore & New away mission
...
Beach Away mission is Now Whiskey Station Mission.
Fixes a large number of bugs from github (Help me pls)
2019-12-16 23:12:56 -05:00
RadiantFlash7
99acb57b34
Bugfixes galore, New beach away, file shrink to 250x250
...
Completely revamps the beach mission. No more 'safe' missions for our intrepid explorers.
Fixes a metric ton of bugs that I actually lost count. My head hurts.
Several varients of mobs have event types added to prevent them from wandering, for the away missions.
Also Shrinks files down to 250x250.
2019-12-16 01:56:56 -05:00
Hawk_v3
74cc210e21
Merge remote-tracking branch 'server/master' into map
2019-10-05 23:10:09 +01:00
Novacat and GitHub
fb52ec08c6
Merge pull request #5114 from Novacat/nova-weapons
...
Expedition Sub-department
2019-04-28 22:57:13 -04:00
Atermonera and VirgoBot
9152030002
Merge pull request #6117 from Neerti/ai_shell_manifest_fix
...
Hides AI Shells from the manifest.
2019-04-22 14:31:22 -04:00
Unknown
6dc8552e8c
Finishes this PR
2019-04-21 21:32:39 -04:00
Hawk_v3
8d868fb890
Merge branch 'map' into RadiantMaster
2019-04-14 18:27:05 +01:00
Neerti and Novacat
30b967e28a
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
Verkister and VirgoBot
acdbd65e22
Fixes PDA manifest excluding all non-syndie borgs ( #5695 )
...
* Fixes PDA manifest excluding all non-syndie borgs
I'm preetty sure the original PR had the opposite intention of what it actually did.
* Update obj.dm
* Update obj.dm
2018-10-21 14:23:48 -04:00
RadiantFlash7
723c3d63be
Mapping work+lumber lockers
...
Added some structures DMI's to use, adjusted mining+part of xenoarch,
did a lot of work on lower level and maint level, added a few closet
variants for lumberjacks
2018-08-05 13:21:22 -04:00
Atermonera and VirgoBot
5ce99af730
Hides syndi-synths from the manifest ( #5411 )
...
* Manifest doesn't show the same stationbound cyborgs and AIs that the upload consoles don't show
* Manifest doesn't show borgs with scrambedcodes set
2018-07-15 13:27:47 -04:00
RadiantFlash7
064bcba242
Chapel/monastary, Prison, library/cafe partway
...
Chapel area and new chaplain pet 'Ignis', Finalized most of the prison,
added a new monastary to be used by the chaplain/monk, and serves as a
public garden for the crew.
Partway done with cafe and library, currently under work.
2018-06-26 19:11:15 -04:00
Arokha Sieyes
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
Woodratt
dd7bfd6c43
Wilderness Overhaul
...
- Heavy rework of the wilderness, minor adjustments to mining and outpost z-levels. To get to the wilderness you now have to travel through the mine z-level to do so, follow the green flagged path through the mine.
- Shuttles can now land at a site near the entrance to the wilderness. Removal of the mine shuttle landing pad to move it to the wilderness.
- New addition of warning sign, thanks to Schnayy.
- Bugfixes for Heist shuttle not going back to raider post, light overlays on shuttle areas, and certain shuttles not leaving behind floor tiles when they should.
2018-02-26 20:10:46 -08: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
Atermonera and Mechoid
bed08c7b7b
Synthetics show up on the manifest ( #4664 )
...
* Silicons actually show up in the pda manifest now
2018-01-29 12:04:25 -08:00
Leshana
eed9f1d6ff
Compensated for addition of Planetary Department to PDAs.
2018-01-19 21:09:02 -05:00
Atermonera and Anewbe
7a6b0fd750
Cleans up PDA Manifest template ( #4540 )
...
* Cleans up PDA Manifest template, adds Planetside and Silicon sections
* Cleanups up some testing code
* A rogue space-indented line
* Hides empty manifest categories
2018-01-18 11:33:09 -06:00
Leshana
32437f2418
Fix mob.loc = X on spawn
...
* When spawning into the game (both latejoin and normal join) the job controller used loc = X to set location. This meant that Enter() was never called for entering the spawn location, and all other associated problems.
* This screws up the new jukebox music system because mob.lastarea is not set correctly.
* Fixed signpost teleporting for the same reason (nobody wants beach tunes playing forever)
2017-03-22 23:05:44 -04:00
Spades
2330968176
Replaces Station Administrator
2016-10-06 22:38:02 -04:00
Neerti
828dacf485
Centralizes weight class definitions
...
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.
Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it. This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files. In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.
The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
SinTwo
a2a2f58e93
Fixes #2352
2016-08-27 13:44:32 -04:00
SinTwo
7192bf08fd
item_state cleanup
2016-07-11 22:31:32 -04:00
Datraen
c09bb6d807
Removes JSON encoding of PDA Manifest list.
2016-03-26 15:31:08 -04:00
Yoshax
8be10d96dd
Ports Byond 510 preperations from Bay
...
Updates comment
Updates supply file
2016-03-14 18:21:44 +00:00
