Commit Graph

7638 Commits

Author SHA1 Message Date
Anewbe
980c982996 Fixes the conflicts in the original branch 2017-03-22 17:51:04 -05:00
Arokha Sieyes
fbb73e1ed8 Merge branch 'master' into robot 2017-03-22 18:45:25 -04:00
Anewbe
2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm
2017-03-22 17:29:01 -05:00
Anewbe
538f91c202 Borg stun arm should work now. 2017-03-22 17:06:16 -05:00
Arokha Sieyes
be36363a23 Ports several Paradise sound emotes (#3039)
* Ports several Paradise sound emotes

* Comment out scream MORE.

* Remove goonsounds, references
2017-03-22 16:11:55 -05:00
Arokha Sieyes
ae68468861 Allow AI to use custom holograms (#3114)
* Compound icon generator proc

Why didn't this exist before? Am I missing something? I need manipulatable icons of existing atoms including their overlays. Is there some easier way to get them than this...?

* Polaris Portion of AI Upgrade
2017-03-22 16:09:04 -05:00
Arokha Sieyes
9660186dfd Not So Simple Animals (#3103)
* Merge two not-really conflicts

Thanks git, that whitespace conflict was super important?

* DME merge

* Added defines for mobs used by simple animals.

* Lost a slime along the way

* Disable debug settings

* HONK!!!

* Remove redundant hostile decls

* Replace loc= with forceMove in old SA code

I guess I should think of the children.
2017-03-22 14:30:07 -05:00
Anewbe
68a335b0c5 Xeno race tweaks 2017-03-21 23:31:10 -05:00
Yoshax
7cf4a81bae Fixes an issue with suits and sprites 2017-03-21 19:14:42 +00:00
Arokha Sieyes
be9bcf81f0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2017-03-21 11:22:29 -04:00
Atermonera
78c1b51f81 Languages with NO_STUTTER won't use autohiss anymore 2017-03-21 00:13:33 -07:00
Arokha Sieyes
60791e3645 VOREStation Portion of AI Upgrade 2017-03-21 03:02:31 -04:00
Arokha Sieyes
5ddf8c8185 Polaris Portion of AI Upgrade 2017-03-21 03:02:15 -04:00
Atermonera
2d2763fdb0 Merge pull request #2 from PolarisSS13/master
There should probably be a way to do this automagically
2017-03-19 17:09:02 -07:00
Atermonera
530593508a Gives surgeonborgs the full medical hud, because why don't they already have it? 2017-03-19 16:58:53 -07:00
Anewbe
b5866d5876 Merge pull request #3088 from Leshana/huhbots
Ports Bot Patrolling back to Polaris (Plus bot fixes)
2017-03-19 16:09:32 -05:00
nachomeep
a007406c0b Fixes singularity sprite. 2017-03-18 13:42:53 -04:00
Arokha Sieyes
878a250dc4 Readds Akula blood color 2017-03-18 01:16:03 -04:00
Arokha Sieyes
805b473976 Polaris Sync Merge
Fixed Polaris merge conflicts
* Space controller merge conflict
2017-03-18 00:58:12 -04:00
Leshana
801dc5e0a6 Fix another runtime when trying to respawn before roundstart.
* If you observe, then want to respawn before the round starts, it runtimes.  Lets prevent this.
2017-03-17 18:03:06 -04:00
Leshana
f3a6678389 Fix another runtime when trying to respawn before roundstart.
* If you observe, then want to respawn before the round starts, it runtimes.  Lets prevent this.
2017-03-17 00:49:19 -04:00
Neerti
d4b6fc9f32 Merge pull request #3052 from Anewbe/emp_things
Reworks empulse and emp_act
2017-03-14 21:39:01 -04:00
Leshana
eb65ff2ed2 Ports the new parts of https://github.com/Baystation12/Baystation12/pull/15298 back to Polaris
* Changes navbeacons to no longer use radios (Doing so was slower and didn't really help anything) Note: var/freq remains for mapping compatibility until all maps are updated.
  * Fixes navbeacons to actually hide under flooring if you put plating over them.
  * Changed how navbeacons are mapped in.  Don't use the picky "code_txt" variable, instead use appropriate subtype.
  * Made useful reusable subtypes so you don't have to code in a type for every. single. one.
* Updated mulebot to use new navbeacon codes.
* Re-activate patrolling!  With the new navbeacons, bots with will_patrol can follow the patrol navbeacons.
  * Note: various "should_patrol" variables on each bot type unified under /mob/living/bot/var/will_patrol
* Securitrons (beepsky) got an overhaul to the new patrol routing.
  * Note: BayStation replaced the snowflake handcuffs code with acutal handcuffs.  Polaris handcuffs requiere a grab to work, so are more complicated.  Kept our existing attack code.
  * Behavior procs reorganized to use better movement detection and just be more flexible.
* Floorbot fixes & removal of bridgemode
  * Floorbot will now remove & replace broken floor tiles.
  * Floorbot will no longer decide its okay to pave over all of SPACE.
  * For the moment patching hull breaches is disabled, it is too laggy.
* Sundry bugfixes to all bots
  * Use forceMove() instead of setting loc
  * Use "\The [X]" message strings.
  * Pass target to do_after() when doing something to a target.
* Fixed events that were supposed to emag bots to now do so again.
2017-03-14 16:29:29 -04:00
Neerti
c91c8dc177 Makes the mention system more robust on name detection.
Changes * to + for bolding.
2017-03-14 15:45:55 -04:00
nachomeep
1b86156052 adds holograms 2017-03-14 14:12:12 -04:00
nachomeep
da9f80fb97 Adds a fuckton of robot + dead AI sprites. 2017-03-14 14:10:07 -04:00
Arokha Sieyes
9a8b0911c6 Angel and Demon languages
Not actually MAGICAL angels and demons, I believe, just they resemble them and are spacefaring races and so sometimes end up matching various religious texts in terms of appearance and habit.

Can we please stop adding whitelisted languages? It's dumb. We have ONE person whitelisted for gutter, and a lot of good it does them since nobody else has even applied. They'd have to talk to someone with a translator.
2017-03-13 12:45:03 -04:00
Arokha Sieyes
0bb3a71625 Merge pull request #1169 from VOREStation/aro-newpolsync
Polaris Sync
2017-03-13 01:50:11 -04:00
Arokha Sieyes
6e8667e948 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync
# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types.dm
#	code/modules/events/canister_leak.dm
#	code/modules/gamemaster/actions/canister_leak.dm
2017-03-13 01:29:01 -04:00
Arokha Sieyes
01edd04bc5 Add several new foods
Sushi, Lasagne, Wings, Doner Kebab, Reishi's Cup, Hot&Sour Soup, General Tso's, Kitsune Udon, Goulash, Roast Beef

Also made it so synths don't have reduced taste. You can just RP it however you want, I'd rather let them see the info about flavor and if you want to RP that you have low quality taste 'sensors' then so be it.
2017-03-13 00:36:34 -04:00
Anewbe
a1b90a0411 Merge pull request #3080 from Neerti/3/10/2017_i_hate_byond_regex
Adds Two QOL Say/Emote Features
2017-03-12 19:48:18 -05:00
Anewbe
ecc5b13908 Merge pull request #3076 from Leshana/handcuffs-hud
Fix handcuff hud icons appearing on the left and right hand inventory hud slots when handcuffed.
2017-03-12 19:24:56 -05:00
Neerti
11b1185005 Adds Two QOL Say/Emote Features 2017-03-12 09:30:48 -04:00
Arokha Sieyes
4c0e330140 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-polsync 2017-03-11 18:47:17 -05:00
Leshana
baf8e2d143 Fix handcuff hud icons appearing on the left and right hand inventory hud slots when handcuffed.
We define the inventory screen objects for hands to be special in that apply overlays to themselves for handcuffed.  By putting that logic on the screen object itself, we allow it to be expanded to other cases besides handcuffs in the future without conflict.
2017-03-10 22:06:05 -05:00
Anewbe
e4fe4256b7 Merge pull request #3066 from Neerti/3/9/2017_wet_skrell_are_liars
Skrell/Tesh Examination Change
2017-03-10 20:53:53 -06:00
Yoshax
d98fcfcc14 Adds pike, weak pike and strong carp, also adds them to the belt mining lists 2017-03-11 02:40:18 +00:00
Anewbe
ac79f548e7 Sorta implements armor soak, very WIP 2017-03-10 20:26:37 -06:00
Mechoid
467cea8a00 Multi-sprite Panel updoot. 2017-03-09 22:54:44 -08:00
Neerti
9167156db5 Skrell/Tesh Examination Change
Examining a Skrell/Teshari while not a member of the same species will obscure the Skrell/Teshari's gender, to better reflect lore.
Ghosts, and silicons (AIs/borgs) are exempt from this.
2017-03-09 02:44:23 -05:00
Arokha Sieyes
ef69742a1c REALLY right-side talk icons
I see the 'just talked' one flips back over.
2017-03-08 19:59:29 -05:00
Arokha Sieyes
4712a9c49a Merge pull request #1137 from VOREStation/aro-pets
Fix befriending pets
2017-03-08 18:28:38 -05:00
Arokha Sieyes
bc3e4291c3 Fix befriending pets
Fixes Runtime and Renault's expected job titles for being befriended.
2017-03-08 18:03:04 -05:00
Anewbe
59a75f37a2 Merge pull request #3026 from Yoshax/ghoststuff
Cleans up, fixes, and improves ghost teleporting
2017-03-08 10:58:36 -06:00
Arokha Sieyes
01a2ae7850 Merge pull request #1121 from VOREStation/sync-2017-03-06
Polaris Sync
2017-03-07 03:40:27 -05:00
Arokha Sieyes
05f7002950 Swap typing indicator to right side
With the common availability of AR glasses, this is super annoying to have it always under the job ID.
2017-03-07 00:53:21 -05:00
Leshana
12ab0e4da2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06 2017-03-06 22:46:28 -05:00
Leshana
f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06
# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme
2017-03-06 20:58:38 -05:00
Neerti
9b13c7367c Merge pull request #3057 from Anewbe/tails
Edits Taj and Unathi tail sprites
2017-03-06 19:02:58 -05:00
Anewbe
132d9a7611 Edits Taj and Unathi tail sprites 2017-03-06 14:41:06 -06:00