Commit Graph

8640 Commits

Author SHA1 Message Date
Leshana
28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme
2018-01-04 22:44:04 -05:00
Neerti
250fe6e2ff Fixes Exploit with Power Tools 2018-01-04 03:08:56 -05:00
Neerti
58a8e6a066 Merge pull request #4499 from Neerti/1/3/2018_why
Fixes Exploit with Power Tools
2018-01-03 15:50:02 -05:00
Neerti
5a0a04d2dd Fixes Exploit with Power Tools 2018-01-03 15:40:43 -05:00
Neerti
d7b5cca562 Merge pull request #4496 from Atermonera/admin_dsay
Admins can see dsay again
2018-01-02 23:20:39 -05:00
Atermonera
3210625822 Admins can see dsay again 2018-01-02 17:11:50 -08:00
Anewbe
1f22838bcc Merge pull request #4482 from Neerti/1/1/2018_rainbow_slime_fix
Rainbow Slime Extracts No Longer Make Wild Slimes
2018-01-02 20:01:38 -05:00
Arokha Sieyes
f7f4a15c50 Destroys botany forever
Why do we have a robot that literally does the entire job. Basically people leave it and it becomes a lag generator forever. Removes farmbot harvesting and removal of dead plants, plus adds an idle timer for 150 process cycles without a target causing it to turn itself off. So basically it will tend the plants and keep them alive, but you need to come harvest them sometimes.
2018-01-02 16:06:13 -05:00
Neerti
41137eeedb Rainbow Slime Extracts No Longer Make Wild Slimes
Also renames wild slime to feral slime.
2018-01-01 08:20:55 -05:00
Neerti
3ee3173a9f Merge pull request #4449 from Verkister/sleeby
Enables rest icons for simplemobs that have them.
2017-12-31 07:30:09 -05:00
Neerti
3c2dac2e01 Merge pull request #4463 from VOREStation/bay-tg-mc-update
Port /tg Master Controller & Garbage Collection Enhancements
2017-12-29 11:20:11 -05:00
Neerti
1c5bd19ca2 Fixes Welding
Welding in a RIG/spacesuit is currently broken. This PR fixes it. It was broken for two reasons.
First, the proc to get flash protection assumed the RIG was a clothing item, and as such thought it had variables it doesn't. So it would runtime.
Second, spacesuit helmets lost their flash protection for some reason. This has been reversed.
2017-12-29 01:51:37 -05:00
Arokha Sieyes
7d16c2e8cd Merge pull request #2647 from VOREStation/aro-deadchat
Fix admin deadchat
2017-12-28 19:10:19 -05:00
Arokha Sieyes
49f27b6b54 Fix admin deadchat
Would be nice.
2017-12-28 18:53:42 -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
Leshana
a435d73450 Ports /tg controller optimizations
https://github.com/tgstation/tgstation/pull/31092 - Fixes subsystems not returning a qdel hint
https://github.com/tgstation/tgstation/pull/31494 - In which the stoner one gets stoned and tries to address tick contention... again
https://github.com/tgstation/tgstation/pull/31950 - Removes an empty New()
https://github.com/tgstation/tgstation/pull/31951 - Logs subsystem shutdowns
2017-12-27 21:19:55 -05:00
Arokha Sieyes
4374bef62a Merge pull request #2636 from VOREStation/aro-talkicons
Flips talking icons to the right side
2017-12-27 15:45:33 -05:00
Arokha Sieyes
8a349ee87c Flips talking icons to the right side
So they don't sit under the HUD icons half the time. Kind of annoying. This is how it used to be.
2017-12-27 02:38:52 -05:00
Arokha Sieyes
40f2dcc73b Fix unused proc in prometheans 2017-12-26 23:35:38 -05:00
Arokha Sieyes
80d69aa161 Organ coloring fix to read species var
Since we use this var to determine how colors work
2017-12-26 23:21:51 -05:00
Arokha Sieyes
5aad70fe29 More things for custom species to copy
These two new vars
2017-12-26 23:17:44 -05: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
Leshana
00a00bb1c8 Use mutable_appearance for HUD health overlays.
This improves the issue of player mobs using excessive CPU every Life() tick.
* Testing determined the worst performance was actually the manipulation of the "healths" HUD doll's overlays.
* Switching to using a mutable_appearance helps quite a bit for little effort.
2017-12-26 17:07:10 -05:00
BothNevarBackwards
4540f770d4 Lots of species stuff ported from Baystation (#4442)
* Ports species based footprints from bay
- https://github.com/Baystation12/Baystation12/pull/17935
- https://i.imgur.com/ojAU373.png
- Unathi use claw on right
- Taj and tesh use paw in center

* Flash stuff glasses protection things

* Flash stuff actual thing

* Organ mult thingy

* Floaty eyes and cloak setup

* Species falling
2017-12-26 14:28:21 -05:00
Anewbe
ddbf7138d9 Merge pull request #4455 from Woodratt/12242017_SCadditions_WR
SC Stupid Sized Map Update
2017-12-26 13:16:46 -05:00
kevinz000
fca889a331 Update human_attackhand.dm 2017-12-25 20:36:16 -08:00
kevinz000
7d6e8c79e3 Handholding 2017-12-25 19:58:20 -08:00
Atermonera
c8f6ef9e9f Merge branch 'master' into VR_Avatar 2017-12-24 15:50:21 -08:00
Atermonera
34dd521fb8 VR mobs can toggle opaque/translucent appearance 2017-12-24 15:42:13 -08:00
Arokha Sieyes
1efb7bfa7c Merge pull request #2592 from Cameron653/SYNC_OY_VEY
Mid December Polaris Sync
2017-12-24 15:35:55 -05:00
Arokha Sieyes
41e460d62b Merge pull request #2608 from Screemonster/fixtheferalness
Xenochimera bugfixes and tweaks
2017-12-24 15:35:36 -05:00
Arokha Sieyes
85972435d8 Merge pull request #2611 from Cameron653/TESHARI_TOGGLE
Adds a proc to toggle passtable
2017-12-24 12:31:53 -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
Cameron653
97d4b9ef72 Move to IC tab. Clarity. 2017-12-24 02:43:24 -05:00
Leshana
67f85d1f90 Minor fixes to Polaris Merge
* Fixes human HUD init so we still get all HUD variables filled.  - TODO - Make our own versions of synthetic HUD for other hud categories if we ever feel like it.
* Re-removed gameticker sound code, this time marked it as VOREStation edit (wasn't marked before)
* Removed duplicate mutable_appearance type now that it is moved to mutable_apperance.dm
2017-12-23 21:54:07 -05:00
mistyLuminescence
c986d57c34 Med Pill Blue Pill (#4404)
* Fixes 4412
* Rebalanced medical gear spawns
* Pill bottle code touched up
2017-12-23 14:45:24 -08:00
Screemonster
8464285ed4 HELL SPAWN 2017-12-23 21:46:10 +00:00
Abbie Fland
6854cfe8b0 Fixed pAI OOC info
Previously, pAI OOC info didn't appear to be getting set correctly,
whether installed through the normal recruit dialog or through an
observer directly inhabiting a loose pAI card.

There was a VOREStation-specific check during pAI creation to copy over
OOC info from preferences, but I tested multiple ways and it didn't seem
to ever succeed.

This change moves that check from creation to login.
2017-12-23 16:15:53 -05:00
killer653
b04d52cc9f Adds a toggle pass table proc
Can be given to any mob via VV. Teshari get the proc.
2017-12-23 14:23:52 -05:00
Arokha Sieyes
b201cf5125 Merge pull request #2593 from VOREStation/aro-movefile
Move VORE borg modules into more correct file
2017-12-22 21:23:09 -05:00
Screemonster
b06be78a87 fixes revive, feral, purge 2017-12-22 21:10:55 +00:00
Cameron653
30c18e8009 It's RED not PURPLE 2017-12-22 02:15:02 -05:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Arokha Sieyes
eb084adb0d Move VORE borg modules into more correct file
The normal ones are in station.dm, ergo the overrides and additions should be in station_vr.dm in the same folder, not in a mysteriously-named file in another folder.
2017-12-21 02:21:45 -05:00
Spades
54b5d74ada Revert "Chirret species" 2017-12-19 19:47:50 -05:00
Cameron653
b7d0c61cee Merge branch 'master' into CHIRRET_SPECIES 2017-12-18 19:48:38 -05:00
Verkister
6789835276 Enables rest icons for simplemobs that have them.
-Mostly just cats and xenos for now.
2017-12-18 10:05:35 +02:00
Verkister
d83b142603 More missed limb icon null checks.
-Should probably decrease crashing even further.
2017-12-17 14:32:58 +02:00
killer653
55c8c8a6fb Merge remote-tracking branch 'refs/remotes/VOREStation/master'
# Conflicts:
#	icons/mob/human_races/markings_vr.dmi
2017-12-17 04:06:35 -05:00
Cameron653
18a56c89ca Update emote_vr.dm 2017-12-16 13:11:40 -05:00