Arokha Sieyes
2d89d63c09
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018
...
# Conflicts:
# code/game/objects/structures/crates_lockers/closets/l3closet.dm
# code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
# code/game/objects/structures/crates_lockers/closets/secure/medical.dm
# code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/game/objects/structures/crates_lockers/closets/utility_closets.dm
# maps/southern_cross/structures/closets/misc.dm
# maps/submaps/surface_submaps/wilderness/DoomP.dmm
# vorestation.dme
2018-05-27 19:26:12 -04: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
868570414b
Swaps out several PoI mobs and turrets
2018-05-20 18:47:27 -05:00
Arokha Sieyes
c8b2783ae0
Update Tesla engine map
2018-05-19 20:36:51 -04:00
ThoughtSynapsis
feec485159
Add's a few new POI's and minor fixes to old ones!
2018-05-16 12:53:03 -04:00
Arokha Sieyes
e0a7ca54de
Luxury shelter borg recharger
2018-05-14 22:48:11 -04:00
Arokha Sieyes
46f6121624
Capsule shelter QOL
...
Bolts/opacity button, roofs for multiz areas
2018-05-14 22:31:09 -04:00
drexample and Atermonera
5d73584fa3
Adds the Statue - A hostile mob, that moves only when you don't see it ( #5108 )
...
* Statue
* Statue done!
* Testing map removed
* Grammar fix + ignoring creator
* Fixed typos, change range to oview, thanks to Atermonera
* made changes that I missed
* Nightvision handling
* diverse blind messages + requested changes
* Bugfixes, added isSynthetic to bots
* commentaries + PoI
* Finalized POI and statue
* removed misclick
2018-05-14 15:21:04 -07:00
Arokha Sieyes
c4cbe31199
Removes taur suits
2018-05-04 22:16:17 -04:00
Arokha Sieyes
b13c703c7e
Fix more VS-specific maps having tags
2018-04-25 18:27:19 -04: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
Arokha Sieyes
cd865a176b
Fix a table sprite and a shelter window layer
2018-04-23 15:44:13 -04:00
Arokha Sieyes
d5c9d3cb4e
Port /tg/ lavaland shelters
...
Nanotech twist rather than bluespace, but whatever.
2018-04-23 15:25:35 -04:00
Arokha Sieyes
f0779da58d
Stage 2 tag removal
2018-04-18 17:37:41 -04:00
Arokha Sieyes
78134b2b29
Stage 1 tag removal
2018-04-18 17:33:22 -04:00
Leshana
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
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
Neerti
f429a176e4
Adds Map Template Groups
...
Adds ability to have many different 'versions' of a PoI, yet only having one show up per round.
An example on how to do this is provided with Radio Free Sif (aka DJOutpost).
Just make sure all the different versions have the same 'template_group' value.
2018-03-30 05:34:11 -04:00
BillyBangles and Atermonera
85e377f017
Adds a cursed sword (and other haunted things) ( #4931 )
...
* adds cursed sword and 'haunted' object framework.
* fixes back.dmi conflicts
* adds cursed blade ghost pod
as well as fixing some ghost pod oddities
* fixes misc.dm conflicts
* adds cursed sword cave POI
* makes cursed sword use voice mob
as opposed to a brainmob
2018-03-19 11:49:33 -07: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
Atermonera and Anewbe
81e5ea9536
Ater poi3 ( #4968 )
...
* Supply Drop POI
* Ration Cache
* BlastMine1
* Supply Drop 2
* Tweaks, package bomb detonators can be re-used
* Changelog
* Missed some spots while cherry-picking
* Merge branch master (I hope this works)
* Appeases travis
* Missed a spot
2018-03-05 19:55:27 -06: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
Anewbe and Atermonera
c13c1c6ad0
Adjusts PoIs ( #4954 )
...
* Adjusts PoIs
2018-03-01 11:57:18 -08:00
BillyBangles and Atermonera
f49b1a9ad2
Adds ice puzzle POIs ( #4963 )
...
* adds slippery ice tiles
* adds ice puzzle POIs
also bedrock (impassable) rock, and ice crystals (which use placeholder
graphics for now)
2018-02-27 17:45:47 -08:00
Leshana
30454ccdc3
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
...
# Conflicts:
# code/game/jobs/job_controller.dm
# code/game/machinery/oxygen_pump.dm
# code/game/objects/items/weapons/storage/firstaid.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/organs/internal/eyes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-02-23 21:55:42 -05:00
BillyBangles and Anewbe
8f8f692ea0
Makes a dark ritual even darker ( #4923 )
...
* makes a dark ritual even darker
* makes the dark ritual maybe not THAT dark
* tweaks rune icon
2018-02-23 13:16:26 -06:00
Anewbe and GitHub
dfdafddaa9
Merge pull request #4897 from VOREStation/pol-analfix
...
Fix health analyzer names
2018-02-21 10:03:09 -06:00
Anewbe and GitHub
db37fc3797
Merge pull request #4891 from ThoughtSynapsis/TSPOI21
...
POI Bugfixes / Sprucing.
2018-02-21 02:02:55 -06:00
Arokha Sieyes
3fdafb7194
Rename medical scanners and update map
2018-02-20 19:25:31 -05:00
Woodratt
dad162659a
New Cave PoIs
...
- Addition of 6 new potential PoIs for the cave z-level.
2018-02-20 00:59:30 -08:00
ThoughtSynapsis
42b7478e38
POI Bugfixes / Sprucing.
2018-02-20 01:30:31 -05:00
mistyLuminescence and Anewbe
d0cd553514
Crashed Medical Shuttle PoI ( #4863 )
...
* Adds a crashed medical shuttle PoI
* Updates
2018-02-19 13:48:30 -06:00
Leshana
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
Anewbe and GitHub
e37ec894b3
Merge pull request #4847 from ThoughtSynapsis/TSPOI20
...
Adds new POI's along with minor fixes to older ones!
2018-02-16 12:53:17 -06:00
ThoughtSynapsis
4e3345dab5
Adds new POI's along with minor fixes to older ones!
2018-02-15 22:58:47 -05:00
Anewbe and Atermonera
7e2df51283
Changes mine code, adds random mine spawners ( #4817 )
2018-02-15 12:19:58 -08:00
zaredman and Atermonera
fdc367a4b5
Changes ammo type from 5.56 to 7.62 ( #4795 )
2018-02-11 19:02:47 -08:00
Anewbe and GitHub
252b2ffa1c
Merge pull request #4772 from Atermonera/obfus_gps
...
GPS coordinates and POI names are obfuscated
2018-02-10 17:51:48 -06:00
Anewbe and GitHub
73150947c7
Merge pull request #4766 from Neerti/2/9/2018_poi_adjustments
...
POI Adjustments
2018-02-10 00:14:13 -06:00
atermonera
fae9c63ccf
GPS coordinates and POI names are obfuscated
2018-02-09 16:59:03 -08:00
Mechoid and GitHub
736134d10f
Merge pull request #4707 from Cerebulon/virologyRetoothing
...
Gives Virology teeth again
2018-02-09 11:49:45 -08:00
Neerti
5532894cde
POI Adjustments
...
Drone subtype added that is slower than the regular type, so that fleeing is an option now.
All drones on surface POIs have been replaced by this subtype.
Fixes power issues in several POIs.
Makes POI SMESes more robust and start full.
APCs in POIs will no longer send an alert to the station.
Fixes missing area in bonfire POI.
Tweaks name and desc of big stompy drone mechas.
2018-02-09 00:26:21 -05:00
BillyBangles and Anewbe
64b98e0dae
Adds 2 new cave POIs ( #4743 )
...
* adds temple and ritual POIs
as well as ever-burning candles, a candleabra, and a neat red crystal that looks like supermatter but isn't
* fixes all cases of 'candelabra' spelling
i am a dunce
* fixes main map changes
i don't even know what i fuckin did to this thing??? ?? ??? ???
* removes unnecessary light() proc
2018-02-08 14:10:02 -06:00
Leshana
1d0f5262d8
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
...
# Conflicts:
# code/__defines/subsystems.dm
# code/controllers/master_controller.dm
# code/controllers/subsystems/atoms.dm
# code/game/machinery/Sleeper.dm
# code/game/machinery/doors/airlock.dm
# code/game/machinery/vr_console.dm
# code/game/objects/items/devices/communicator/phone.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/modules/admin/admin_verbs.dm
# code/modules/mob/living/carbon/carbon.dm
# code/modules/multiz/movement.dm
# code/modules/projectiles/gun.dm
# code/modules/shuttles/shuttle.dm
# code/modules/shuttles/shuttles_web.dm
# icons/obj/doors/doormed.dmi
# maps/southern_cross/items/headset_sc.dm
# maps/southern_cross/southern_cross-3.dmm
# vorestation.dme
2018-02-07 19:30:50 -05:00
Cerebulon
d592d1fc17
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into virologyfixes
2018-02-07 03:40:06 +00:00
ThoughtSynapsis
12957a6552
POI Bugfixes
2018-02-06 02:26:25 -05:00
Cerebulon and Aronai Sieyes
5fac3abdc3
Virology changes
2018-02-04 03:46:23 -05: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
ThoughtSynapsis
05ab2fd298
Bug fixes for multiple POI's.
2018-02-01 23:12:16 -05:00
Neerti and GitHub
a24df956ec
Merge pull request #4682 from ThoughtSynapsis/TSPOI6
...
Add additional POI's and fixing others.
2018-01-31 15:42:58 -05:00
Arokha Sieyes