Leshana
33202c5c38
Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01
...
# Conflicts:
# code/modules/mob/living/simple_animal/animals/giant_spider.dm
# html/changelogs/.all_changelog.yml
2018-05-10 13:48:20 -04:00
ReddeyfishVor
3c931ad535
Prevent negative weight events from happening
2018-04-27 17:10:41 -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
Leshana
cfdbfafddf
Comment out defunct mundane news event from our custom event lineup.
2018-04-15 14:56:39 -04:00
Leshana
b5cf8383f6
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14
...
# Conflicts:
# code/game/machinery/jukebox.dm
# code/modules/economy/lorenews.dm
# code/modules/mob/living/carbon/human/update_icons.dm
2018-04-15 14:19:36 -04:00
ReddeyfishVor
d65294a796
Add moderate requirement for electrify
...
Creates a minor severity version of the event that only damages, removes safeties, and bolts the door.
2018-04-14 10:37:58 -07:00
Reddeyfish
bbcd0f24e0
Add several new events
2018-04-13 18:03:42 -07:00
elgeonmb
4ef644ffb8
Kills the Vir Times and replaces the economic destination list with Polaris locations. ( #5132 )
...
* kills the Vir Times and replaces the economic destination list with Polaris locations.
gibson gazzette can stay but you're on thin ice
* Update TradeDestinations.dm
2018-04-06 13:32:43 -05: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
elgeonmb
0a1e3d798b
Lore-Compliant Oculum News Channel ( #5111 )
...
* adds an e-reader full of news to the loadout
* Political Almanac -> Pocket Newscaster
* new news channel containing lore-compliant news that's not bad
2018-03-28 13:01:10 -07:00
Arokha Sieyes
70723930ff
VS: Helps with #2982 #2521 #2541 - Solar grub event tweaks
...
Eventually notifies you where the remaining live ones are
2018-03-20 18:15:04 -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
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
elgeonmb
66c36b6beb
moves us out of the kara system, pt 1
2018-02-05 23:21:20 -08:00
Leshana
62ef3b1820
Make the Metor Strike random event be configurable per map.
...
* Added a variable to configure which areas are vulnerable to meteor strikes instead of hard coding it.
2018-01-17 11:04:20 -05:00
Cameron653
6841b5a6fe
this here stuff
2017-12-29 20:01:23 -05:00
killer653
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
Neerti
acb208dd3f
Works on New Blob
2017-11-29 22:35:01 -05:00
Ketrai
1fcd28f732
Bumps grub frequency down.
...
They've been a little too frequent, a bit redicilous. Will try n add another external event for variety sometime too. (like lizards and gaslamps spawning outside, more variety)
2017-11-29 20:27:42 +01:00
Cameron653
de0ce9285d
Stop causing bots to kill everyone, jesus christ
2017-11-13 17:38:19 -05:00
Spades
4bc0708f01
Merge pull request #2282 from Cyantime/grublarvs
...
Improves solargrub larva
2017-10-12 18:12:31 -04:00
Cyantime
612db9b2c0
wooorms
2017-10-11 13:29:31 -04:00
Cameron Lennox
15a6472d14
Pol Sync
2017-10-08 17:44:25 -04:00
Ketrai
21e97e0d65
Clarifies the grubevent announcement.
...
Now grubs are nerfed, this hopefully will clear up any misunderstandings. All crew should be able to deal with grubs, and certain departments shouldn't monopolize the killing. (or feel required to interrupt scenes to chase down grubs, they're not that strong anymore.)
2017-10-02 20:49:10 +02:00
Cameron653
236e7812e3
Reenables solar grub events
2017-09-29 18:52:01 -04:00
Cameron653
0832710cc4
Disables grubs until somewhat reworked
2017-09-22 23:42:01 -04:00
Neerti
afd7b15442
Adds the Lost Drone
2017-09-22 01:17:53 -04:00
Ketrai
4f2c98df32
adds grubevent
2017-09-10 19:55:32 +02:00
Ketrai
b25b7127de
adds grubevent
2017-09-10 19:54:25 +02:00
Spades
6eb472f31d
Revert "Adds a new event - Solargrubs!"
2017-09-09 12:24:37 -04:00
Ketrai
0ae8e9521a
Fixing outdated file
...
grubs grubs grubs, we all live for the grubs
2017-09-06 12:04:29 +02:00
Ketrai
592575cdca
adds and enables grubevent
...
shockin
2017-09-05 16:12:50 +02:00
Ketrai
948f7b4724
Adds the grub event
...
Randomly spawns about 8 grubs around station.
2017-09-05 16:08:52 +02:00
killer653
2f18b90d04
Decreases the explosion of meteors by a lot.
...
It put phoron in the entire fuckin station!
2017-08-10 21:22:38 -04:00
Cyantime
54f4cd6bbe
Fix meteor runtime
2017-08-08 15:38:12 -04:00
killer653
468e73c7f3
Polaris sync
2017-08-06 19:07:17 -04:00
Cyantime
c301abbfc9
Magboots check
2017-08-01 21:16:13 -04:00
Cyantime
02dc0d8dba
Was too low
2017-07-31 07:58:29 -04:00
Cyantime
39917bf01a
Meteors Now
2017-07-29 20:37:06 -04:00
killer653
317b9e18e3
Fixes Ion storm from blocking all PDA messages
2017-07-28 06:57:49 -04:00
Cameron653
e158fcd3cc
Macro Replacements. ( #3574 )
...
* A preface to my madness
Travis failed one of my PR's because I copied old code
that used /red /blue /green.
Because of this, I am going to find and replace every
instance of it that I find.
Also this is a test commit to make sure I'm comitting
to the correct branch.
* /blue /green /red replacements
Dear god.
A slow and painful death from acid is more fun than this.
I wouldn't wish this torture on my worst enemy.
And this is only the beginning
* Replace part 2.
Time to fix the human error.
* Fixes mismatches
* Sets macro count to 220
One above the current number of macros in the code.
* Fixes last of the mismatches.
* Removes spaces, replaces \black
Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen
* Updating macro count again
* More fixes!
* Issues fixed! For real this time!
I swear!
* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00
Leshana
197a648795
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
...
# Conflicts:
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/multiz/movement.dm
# code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
Anewbe
0af77012c4
Merge pull request #3465 from Yoshax/radiation
...
Ports radiation rework and stuff from Bay
2017-05-31 18:37:58 -05:00
Leshana
34c73dab69
Optimization/Rewrite of Radiation Controller
...
* The performance of the radiation controller as-is was not fast enough for inclusion in production servers, but it has some nice featuers, so rewrote it to be more performant.
* Instead of storing the radiation strength for every turf, we only store the sources of radiation, and calculate the strength only for mobs who might be in range.
* Old method was ray-tracing to every turf in range whether anything was there to be irradiated or not. Could be hundreds of turfs. New method only lazily calcualtes strength at a turf if we actually need to know it. Often times this is zero turfs if nobody is standing in engineering.
* Removed the automatic processing of objects with "rad_power" set. Objects are responsible for calling the repository to create/update their radiation sources. Saves some extra overhead that in practice was redundant with other process controllers.
* Also tweaked to be more respectful of qdel'd objects and added some comments.
2017-05-25 18:43:56 -04:00
Leshana
9d2e7fe1ae
Prevent Gravity Failure event from disabling gravity on planet z levels.
2017-05-24 17:14:03 -04:00
Leshana
ae270c6938
Adjusts random events to be more suitable for the Tether
...
Fixes #1542 Fixes #1396
* Disables the Supply Demand event until it can be reworked to be more interesting.
* Removes volatile fuel from the possible gases leaked in Atmos Leak event.
* Excludes areas around spawn points from the Atmos Leak event.
* Prevents gravity failure from disabling gravity on planetary z levels.
2017-05-24 17:08:39 -04:00
Yoshax
e5ebd3a56d
Fixes a radiation oversight
2017-05-22 16:33:37 +01:00
Yoshax
40ba4f5913
Fixes a radiation oversight as per Bay
2017-05-22 16:29:04 +01:00
Yoshax
660d6d0ebe
Tweaks readstorms as per Bay
2017-05-22 16:26:24 +01:00
