cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-22 23:32:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,446 Commits 2 Branches 1 Tag
971cd2da3025f6c8bdae9724aa8a8a7ed72b224c
Commit Graph

7153 Commits

Author SHA1 Message Date
Atermonera
971cd2da30 Translators don't understand animals and other languages that recorders can't record. 2017-04-01 16:48:01 -07:00
Atermonera
85c78001cb Several simple_animals have their own languages, with custom syllables. 2017-04-01 16:46:28 -07:00
Anewbe
91be79fdb3 Tweaks a bunch of body markings 2017-03-31 15:17:02 -05:00
Anewbe
cc3e91de21 Merge pull request #3188 from VOREStation/aro-pol-bodymarks 
Symbols make sprite accessories freak out
 2017-03-31 00:58:15 -05:00
Arokha Sieyes
7f99b3b45d Symbols make sprite accessories freak out 
Like plus or ampersand or single or escaped quotes in the name, it goes crazy. You can't remove Socks+Belly because it has a plus, once you've added it. I have no idea why. But here's a quick fix.
 2017-03-31 01:48:00 -04:00
Anewbe
5ceb96dfb5 Merge pull request #3186 from VOREStation/runtimes-fix 
Fix Runtimes
 2017-03-30 21:53:22 -05:00
Anewbe
cf9e3f8789 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into overdose_boogaloo 2017-03-30 20:51:13 -05:00
Leshana
379ac4c63d Fix Runtimes 
click.dm fixes:
[09:46:49] Runtime in unsorted.dm,1293: list index out of bounds
  proc name: screen loc2turf (/proc/screen_loc2turf)
[09:46:49] Runtime in click.dm,345: Cannot execute null.Click().
  proc name: Click (/obj/screen/click_catcher/Click)
paper_bundle.dm fixes:
[10:30:21] Runtime in paper_bundle.dm,183: Cannot read null.loc
  proc name: Topic (/obj/item/weapon/paper_bundle/Topic)
human.dm fixes:
12:27:51] Runtime in human.dm,1476: Cannot read null.name
  proc name: Toggle Underwear (/mob/living/carbon/human/verb/toggle_underwear)
 2017-03-30 21:20:31 -04:00
Anewbe
d59f0f1dc4 Merge pull request #3152 from VOREStation/aro-pol-bodymarks 
Adds Body Markings
 2017-03-30 20:13:15 -05:00
Anewbe
f7d086fa59 Overdose is more dangerous, Bicaridine works again 2017-03-30 20:09:21 -05:00
Leshana
b562941377 Added a few fish as simple animals 
* They are simple non-hostile simple_animal's that wander around a bit.
* Wandering code is overriden so they will not leave the water.  And they will take damage as an unsuitable atmosphere if they do.
* Fish sprites improved and animated by Kligor
 2017-03-30 13:09:11 -04:00
Anewbe
e9ad3eba3a Merge pull request #3174 from VOREStation/aro-pol-squish 
Copypaste error on *squish
 2017-03-29 13:25:12 -05:00
Arokha Sieyes
a66eba807f Copypaste error on *squish 
Whups!
 2017-03-29 14:16:16 -04:00
Anewbe
cdf69e0eec Italics switch from / to | characters 2017-03-28 21:13:46 -05:00
MagmaRam
2f976a22f8 Merge pull request #3158 from Anewbe/fbp_screams 
FBPs should no longer scream when they collapse
 2017-03-28 20:03:01 -05:00
MagmaRam
9ff0180315 Merge pull request #3138 from Anewbe/radio_freqs 
Antag Radio changes
 2017-03-28 20:02:44 -05:00
MagmaRam
33dffeb0b8 Merge pull request #2955 from Anewbe/heart_damage 
Big Ol' Medical Tweaks
 2017-03-28 20:02:24 -05:00
MagmaRam
c7e224b6e2 Merge pull request #3075 from Anewbe/armor_soak 
Implements Armor Soak
 2017-03-28 20:02:00 -05:00
MagmaRam
add4607d98 Merge pull request #3159 from Anewbe/electric_welder 
Adds the electric welder
 2017-03-28 19:56:43 -05:00
Anewbe
0924e4e7a2 Merge pull request #3135 from Belsima/skrell 
Skrell sprite updates.
 2017-03-28 18:28:58 -05:00
Anewbe
a65722929f Merge pull request #3086 from ghost/robot 
Adds a fuckton of robot, hologram, and AI sprites.
 2017-03-28 14:38:08 -05:00
Anewbe
cddbc6e976 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into radio_freqs 2017-03-28 14:28:15 -05:00
Anewbe
d66e1beca0 Adds the electric welder 2017-03-27 22:43:20 -05:00
Anewbe
73ab115295 Fixes a thing. 2017-03-27 22:32:02 -05:00
Arokha Sieyes
52130160db Adds Body Markings 
So you can customize your character with tattoos or fur colors for Taj or whatever. I'll let Anewbe work out what he wants to whitelist other than what I did already.

The icons are sliced up with the HumanScissors program I wrote, so they are per-organ. So, lop off a limb, put it on someone else, they have the tattoos and whatnot. It's part of DNA so it comes with when cloning.

They are defined in the normal sprite_accessories file and the icons are all in markings.dm in the format of "markingname-organtag" so if you have a marking that spans both arms and torso you need "thatone-torso", "thatone-l_arm", "thatone-r_arm" icon states.
 2017-03-26 19:36:34 -04:00
Anewbe
22ae87c376 Fixes a bug with meatbrain FBPs. 2017-03-26 16:34:47 -05:00
Neerti
629a044761 Merge pull request #3137 from Anewbe/robot_skintone 
Adds skintone to FBPs
 2017-03-25 20:57:01 -04:00
Anewbe
f316fd2dca Merge pull request #3136 from Belsima/master 
Updates drone respawn time.
 2017-03-25 16:37:08 -05:00
Belsima
50bc49ff86 Five minutes instead. 2017-03-25 17:29:37 -04:00
Anewbe
88b0c6086e Antag Radio changes 2017-03-25 14:19:57 -05:00
Anewbe
d90699998b Adds skintone to FBPs 2017-03-25 13:55:49 -05:00
nachomeep
9c86db2669 dron respawn time change 2017-03-25 14:37:06 -04:00
Anewbe
81d401c7e0 Removes the testing code 2017-03-25 10:54:55 -05:00
Neerti
eb73ee4b44 Merge pull request #3120 from Anewbe/alien_tweaks 
Xeno race tweaks
 2017-03-25 11:27:22 -04:00
nachomeep
fda29e2bc0 big sprite update for skrell 2017-03-25 10:08:03 -04:00
Anewbe
3816d634ed Merge branch 'master' of https://github.com/PolarisSS13/Polaris into armor_soak 
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
 2017-03-24 16:35:31 -05:00
MagmaRam
e3a87c1c78 Merge pull request #2985 from Anewbe/more_pdas 
Adds rugged style PDAs
 2017-03-22 19:42:19 -05:00
MagmaRam
d603394226 Merge pull request #3121 from Anewbe/borg_zap 
Borg stun arm should work now
 2017-03-22 19:42:01 -05:00
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
Atermonera
78c1b51f81 Languages with NO_STUTTER won't use autohiss anymore 2017-03-21 00:13:33 -07: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