cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-23 00:22:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,181 Commits 2 Branches 1 Tag
76b077af4a124c1d52bdb5711cb1517b14fcfe8e
Commit Graph

18004 Commits

Author SHA1 Message Date
Anewbe
1126523497 Merge pull request #4202 from mistyLuminescence/mappingstuff 
Chemist and Psychiatrist locker fixes, for real this time.
 2017-11-05 20:08:34 -06:00
Anewbe
c79cca6686 Merge pull request #4219 from Atermonera/AI_langs 
Ai langs
 2017-11-05 19:58:28 -06: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
Woodratt
114d391bb9 High Capacity Water Tanks 
- Adds in code and sprites for high capacity water tanks. 5 times the volume of a regular one.
- [Edit] Uses the regular fuel tank and water tank sprites.
 2017-11-04 22:41:28 -07:00
Atermonera
b39d38f933 AI get local rootspeak 2017-11-04 21:01:11 -07:00
elgeonmb
99a227838d gives vatties an econ modifier 2017-11-04 17:15:23 -07:00
Anewbe
2dfb3de415 Revert "Converts colorable species into the combo blend mode." 2017-11-04 15:47:32 -05:00
mistyLuminescence
41f332df42 fuck this pr PART TWO 2017-11-04 00:00:07 +00:00
mistyLuminescence
a0c5ecb8d5 UPDATES IT FOR REAL THIS TIME 2017-11-03 23:29:14 +00:00
Anewbe
ae6583e5fb Cleans up some Event Manager code 2017-11-03 16:24:36 -05:00
Anewbe
0c6a93e38c Merge pull request #4203 from Verkister/loadandblend 
Enables the combo blend mode for most colorable loadout gear.
 2017-11-03 15:11:37 -05:00
Anewbe
fce9fe2c72 Merge pull request #4188 from Atermonera/VR_2 
Virtual Reality
 2017-11-03 15:10:53 -05:00
Anewbe
af21d68eea Merge pull request #4192 from Wickedtemp/Wickedtemp-Hypovial 
Adds the Vial-Based Hypospray
 2017-11-03 15:10:43 -05:00
Mechoid
d81b1b2cba Merge pull request #4108 from Anewbe/more_dangerous_voidsuits 
Voidsuits breach more easily
 2017-11-03 08:47:27 -07:00
Verkister
26ea6ec92d Enables the combo blend mode for most colorable loadout gear. 
-The most meaning the colorable uniforms, suits, gloves, shoes, headgear, earwear, and accessories.
-Only affects mob icons for now, the inventory/floor icons still in old blend.
-Sort of a framework for possible additional options to come.
-Also messed around with some other stuff such as adding on-ear icons to the rest of the flower pins and bows, and made the base icons for the beanies lighter than the middle gray they were.
 2017-11-02 15:33:52 +02:00
Atermonera
28e7426597 Hug gender (#4195) 
* Revert "Update #3? 4?"

* Revert "Revert "Update #3? 4?""

* Hug doesn't reveal gender

* Wrong logic
 2017-11-02 01:00:05 -05:00
Belsima
28ab1e51f3 Removes some loadout items that have colorable versions. (#4173) 
* Removes the 5000 flats options.

* Removes the 5000 hair flower pin options.
 2017-11-01 22:19:20 -05:00
Anewbe
6abe54c323 Merge pull request #4189 from Verkister/comboblendoo 
Converts colorable species into the combo blend mode.
 2017-11-01 22:18:47 -05:00
Neerti
df7c7ead5f Merge pull request #4182 from Anewbe/rerobust_simple_mobs 
Adjusts simple mobs
 2017-11-01 23:11:24 -04:00
Neerti
9bb5db3755 Merge pull request #4187 from Anewbe/electrocute_act 
Improves electrocute_act, adds ELECTROCUTE damage type
 2017-11-01 23:11:07 -04:00
Anewbe
67792ad5b5 Adds a necessary rand 2017-11-01 21:59:43 -05:00
Anewbe
6611cb271b Merge pull request #4190 from mistyLuminescence/plushierework2561 
Plushie tweaks!
 2017-11-01 21:57:56 -05:00
Verkister
d36753c2fd almost forgot tesh had no separate deform sheet to convert 2017-11-01 09:45:27 +02:00
Atermonera
61a9c434f1 ATC ships won't go to the current station 2017-10-31 22:59:34 -07:00
Anewbe
08bcfded73 Changes how organ infections work 2017-11-01 00:41:59 -05:00
Wickedtemp
a3ba6ff5d9 Update hypospray.dm 2017-10-31 20:52:02 -05:00
mistyLuminescence
f67a3858cd Plushie tweaks! 2017-10-31 15:47:00 +00:00
Verkister
45f53405fe Converts colorable species into the combo blend mode. 
-Unathi, Tajaran, Skrell, and Teshari now use mult+add combo blending.
-As do their tails, tail anims, and extra tesh feathers.
-No issues detected on latest test runs.
 2017-10-31 12:50:15 +02:00
Atermonera
64942bd04c VR Core 2017-10-30 22:32:36 -07:00
Anewbe
cc7ba41c34 Improves electrocute_act, adds ELECTROCUTE damage type 2017-10-30 22:00:25 -05:00
Anewbe
8d8052f486 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into rerobust_simple_mobs 
# Conflicts:
#	code/modules/mob/living/simple_animal/simple_animal.dm
 2017-10-30 21:32:14 -05:00
Neerti
318ccff1c9 Merge pull request #4177 from Anewbe/background 
Ports the background icons for char setup
 2017-10-30 20:35:55 -04:00
Neerti
156423f0a2 Merge pull request #4174 from Anewbe/simple_animal_attacks 
Buffs simple mob hit chance
 2017-10-30 20:35:21 -04:00
Neerti
a981f9388f Merge pull request #4183 from Dunkhan/master 
Added a set of atmospheric analysis sensors...
 2017-10-30 20:33:07 -04:00
Verkister
1ba7a08339 Fixes borgs being unable to push past humans. 
-Swap flags (for bumping in help intent) did not include humans for no given reason while still allowing other mobs and other way around interaction.
 2017-10-30 21:17:59 +02:00
Anewbe
ad8a7f4ff0 Merge pull request #4172 from Belsima/rng 
Emag RNG removed from APCs.
 2017-10-29 14:27:32 -05:00
Dunkhan
c6c015ebbb Added full stops to description text 2017-10-29 20:08:44 +01:00
Dunkhan
ef40c806be Removed trailing list commas 2017-10-29 17:34:21 +01:00
Anewbe
2ee7769305 Merge pull request #4179 from Verkister/hairrevolution 
It's time for hair color revolution here too!
 2017-10-29 10:25:26 -05:00
Dunkhan
151e2b8d02 Fixed spelling and capitalisation errors 2017-10-29 15:07:18 +01:00
Dunkhan
2dbbd59888 Added a set of atmospheric analysis sensors to the integrated electronics module 2017-10-29 14:46:14 +01:00
Anewbe
93464d16db Adjusts simple mobs 2017-10-28 15:44:39 -05:00
Anewbe
61c122aea0 Tox damage shows up on Self-Diagnosis 2017-10-28 14:58:19 -05:00
Mechoid
91298b1106 Merge pull request #4167 from Anewbe/soak_fix 
Armor soak should actually work for humans now
 2017-10-28 12:27:04 -07:00
Anewbe
0c4e88ec32 Adjusts how radiation works, especially for FBPs 2017-10-28 14:08:48 -05:00
Verkister
404ac0f42c It's time for hair color revolution here too! 
-Aye greetings from downstream hell where I managed to solve the locally intense ADD vs MULTIPLY blend mode discource once and for all with a fresh as hell new option that combines the best of both worlds without the downsides.
-You can now have hairstyles that retain both, shading and highlights in every color how cool is that?
-Got told to port this stuff up here too so you're welcome. Spread the word if ya want. Planning to hit up the other blend stuffs as well some time, but here's a little something for now.
 2017-10-28 17:00:21 +03:00
Anewbe
966749b5f4 Merge pull request #4168 from Neerti/10/27/2017_lag_fix 
Proto/Autolathe lag fix
 2017-10-28 02:13:12 -05:00
Anewbe
c68fb0861f Ports the background icons for char setup 2017-10-27 23:00:34 -05:00
Anewbe
c9cbbd3a9b Swaps non-mounted recharging guns to batteries 2017-10-27 20:43:31 -05:00
Anewbe
eb4a6744f8 Merge pull request #4163 from Anasari/PaperPlane 
Port paper plane from /tg/
 2017-10-27 20:38:48 -05:00