Commit Graph

406 Commits

Author SHA1 Message Date
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
Aronai Sieyes
f36f32afc0 Merge pull request #2970 from VOREStation/aro-admenucleanup
Remove several admin verbs from context menu
2018-02-04 16:27:33 -05:00
Arokha Sieyes
fbb34ea0ed Remove several admin verbs from context menu 2018-02-04 12:32:55 -05:00
Arokha Sieyes
8b6c76af81 POLARIS: Cut down ghosting admin spam 2018-02-04 01:53:23 -05:00
Arokha Sieyes
85c8c123f1 POLARIS: Cut down ghosting admin spam 2018-02-04 01:52:39 -05:00
MarinaGryphon
72318d46b6 Replaces most of the gender macros. (#4681)
* Fixes #4632.

* 1:27 am coding best coding

* fixes a warning

* Removes the last of the gender macros. Gender is dead.

* gender II: the travis-ing

* linebreaks are dead too.

* oops i accidentally the gender, also ambiguous gender is now taken into account for get_visible_gender
2018-02-03 14:40:09 -06:00
Leshana
f6f3abe5ec Make ghosts invisible again. 2018-01-30 23:36:57 -05:00
Arokha Sieyes
1558cd47df 3 Fixes (#4600)
* POLARIS: Do this lazily

* POLARIS: Speed up visible_message and audible_message

* POLARIS: Destroy this list rather than cutting it, for future safety
2018-01-21 16:17:04 -06:00
Arokha Sieyes
8225d30b9e VS: AR Entopics and Soulcatcher projecting (+Worldbender) 2018-01-20 23:29:24 -05:00
Arokha Sieyes
c127d317f4 POLARIS: Do this lazily 2018-01-20 22:08:58 -05:00
Arokha Sieyes
71d8672d58 POLARIS: Don't show ghost huds on people who've died okay 2018-01-17 23:02:11 -05:00
Arokha Sieyes
cf05d8c4c2 POLARIS: Don't show ghost huds on people who've died okay 2018-01-17 23:01:33 -05:00
Arokha Sieyes
f2fef6f410 Planes Framework (#4545)
* Polaris initial plane upstream merge

* POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT

* POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.

* POLARIS: Adds a 'alter values' proc for plane master ease of tweaking

Setting stuff like colorblindness variety and things.

* Remove NIF reference, fix lighting layer define

* Handle effects above lighting plane

* Moved all layer defines to planes+layers.dm
* Fixed overlays that are supposed to be above lighting to use the PLANE_LIGHTING_ABOVE

* Merge: 3000% human/update_icons() speed improvement

* Merge: Avoid ghosts pointing at things
2018-01-17 13:45:54 -06:00
Arokha Sieyes
10aabd98da POLARIS: 3000% human/update_icons() improvement
Using overlays in lists and a mutable_appearance
2018-01-15 21:39:47 -05:00
Arokha Sieyes
ad74dec1c0 POLARIS: Planes shenanigans. Begins 'plane' work. 2018-01-14 00:39:59 -05:00
Arokha Sieyes
cb0a9f009d Allow ghosts to enter Soulcatchers
Ghosts now have a verb "Join Into Soulcatcher" that lists all players, and they can pick one to ask them if they can join into their SC. If they don't have one, it notifies the ghost (this is less expensive than trying to crunch who has a soulcatcher and shortening the list. You can just deal with it okay??). You cannot get backed up if you joined this way, like there's no way to move from being a ghost to being in someone's head to being in a mob. You'd need to ghost and respawn normally. (This is intentional... no sneaky no-manifest people getting in).

And various other SC QOL things:
- Adds NMe and NSay verbs when you get a soulcatcher installed so you can use them in the text parser at the bottom of the window or click them in the verb list like a crazy person. The older emotes also still work.
- Prevents 'loop of madness' where both pred and prey have soulcatchers and it floods your log as it tries to decide who catches who
- Removes minds if the client is disconnected for a long time, or if the player ghosts out of the NIF
2017-12-28 16:36:43 -05:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Mechoid
931056877f Merge pull request #4391 from Anewbe/ghosts
Ghosts no longer show up over living mobs
2017-12-05 21:44:23 -08:00
PrismaticGynoid
ba271e168b Ports check_radiation verb for ghosts
From https://github.com/Baystation12/Baystation12/pull/19390 . Ghosts now have a check radiation verb they can use to see the radiation level of where they're standing, similar to geiger counters. Tested in every scenario involving radiation I could think of, and it works just fine.
2017-12-03 15:43:01 -08:00
Anewbe
4d938d58bb Ghosts no longer show up over living mobs 2017-12-02 19:43:44 -06:00
killer653
70e53b96bb Polaris Sync 2017-11-10 11:37:41 -05:00
Neerti
53bd641271 Merge pull request #4208 from Anewbe/more_event_manager
Cleans up some Event Manager code
2017-11-05 17:11:30 -05:00
killer653
11c195debb Polaris Sync 2017-11-04 13:37:13 -04:00
Anewbe
ae6583e5fb Cleans up some Event Manager code 2017-11-03 16:24:36 -05:00
Anewbe
fce9fe2c72 Merge pull request #4188 from Atermonera/VR_2
Virtual Reality
2017-11-03 15:10:53 -05:00
Atermonera
64942bd04c VR Core 2017-10-30 22:32:36 -07:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Anewbe
cad5ef12e7 Does work on the event manager role again 2017-10-18 20:00:01 -05:00
Anewbe
4459d7087a Revert "Does more prep for the Event Manager role" 2017-10-04 18:33:34 -05:00
Anewbe
c2c6b5949a Does more prep for the Event Manager role 2017-10-02 21:51:48 -05:00
Spades
c89512940f Merge pull request #2089 from Verkister/ghostboop
Adds a ghost verb to alert blank pAI cards.
2017-09-01 18:11:20 -04:00
Verkister
f47db4995b Adds a ghost verb to alert blank pAI cards.
-The verb causes available empty pAI devices to briefly flash an alert on their screens.
-Didn't add the sound part due to spam protections failing for the sake of annoyance prevention. Just gotta hope someone walks right past when ya do it.
-You can now indicate the things might actually be of use for once without having to resort to metabegging.
2017-09-01 12:52:52 +03:00
killer653
cafac8efae Polaris Sync 2017-08-28 20:52:11 -04:00
Cyantime
abc826320e Safer vent selection for spawned mice. 2017-08-16 16:57:18 -04:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
killer653
0454e15726 Makes the check silently fail 2017-08-03 21:03:59 -04:00
killer653
f71cce4862 spooky 2017-08-03 20:00:13 -04:00
killer653
df3eebbcae Allows admins to write in blood 2017-08-03 19:58:40 -04:00
Anewbe
968dfe666c Changes how darkvision works 2017-07-28 21:11:05 -05:00
Cameron653
97957fcaee Replaces more macros. (#3647)
* MORE MACRO CHANGES

AHHHHHHHHHHHHHHHHHHHH

* Fixes a few typos

* Fixes compile error

* Fixes for real

* 4 macros left that I can't find
2017-07-27 21:12:21 -05: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
Anewbe
14fb294e79 Merge pull request #3610 from Atermonera/Observer_icons
Adds various animal sprites to ghost icons
2017-07-18 20:20:02 -05:00
Atermonera
f334fbe3a2 Fucking commas 2017-07-17 17:02:02 -07:00
Atermonera
cd8b89d249 Adds various animal sprites to available ghost sprites 2017-07-17 16:40:54 -07:00
Leshana
4b46703d9d A plethora of Destroy() fixes - return qdel hints and clean stuff up. 2017-06-14 01:07:35 -04:00
Leshana
cae4b3f12c A plethora of Destroy() fixes - return qdel hints and clean stuff up. 2017-06-11 23:48:17 -04:00
Leshana
4f138abfcc Converts Resleeving Transcore to be a subsystem
* Since the transcore has a ticker process, it really should be a subsystem.  Converted it over.  However, because its ticker is so fast, I did not bother implementing MC_TICK_CHECK into it.  Therefore it has the SS_NO_TICK_CHECK flag.
* Because its a subsystem, the global variable is now SStranscore instead of transcore.
* Because subsystems are so easy to debug, I removed the "TC" debugging variable from the machines that used it.
* Organized a few files.  The transcore subsystem is in the subsystems folder.  Defines had to be moved to defines folder so they are included first.
2017-06-11 18:32:40 -04:00
Arokha Sieyes
c9595f5ba8 Adds 'Quit This Round' verb for ghosts
This verb frees your job slot, removes you from the manifest, and removes your mind/body records so you can't be resleeved (if you do this sooner than 15 minutes, medical will not be nodified of your demise). This prevents you from respawning as that character (you can play any other character if you want).

**People should start using this**, it's really helpful to people who want to play your job if you're not coming back. Just use it if you're done for the day, or want to switch characters, or whatever.
2017-06-09 23:05:48 -04:00
Leshana
4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08
# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme
2017-05-08 21:07:45 -04:00
Neerti
d6683be3ce Adjusts Changelings
See PR
2017-04-23 13:22:32 -04:00