cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 09:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,398 Commits 2 Branches 1 Tag
09fbbab008b05876f852ce9718cf827e03785c2b
Commit Graph

26499 Commits

Author SHA1 Message Date
Mechoid
09fbbab008 Species Sprites for the Firebug. Emagged suit cyclers can now modify to their sprites. 2017-11-06 17:37:34 -08:00
mistyLuminescence
396b2c78e7 Removes bad meme from hairstyle code 2017-11-06 14:38:37 +00:00
Neerti
231211ef15 Merge pull request #4224 from Anewbe/esay_fix 
Actually gives Event Managers ESAY
 2017-11-06 00:38:08 -05:00
Anewbe
c430275c31 Actually gives Event Managers ESAY 2017-11-05 23:06:11 -06:00
Sabess
c96781499f Allows detectives to take an optional revolver + some other stuff (#4217) 
* I'm like 99% sure this works

* uhm

* accidentally broke something after I tested but before I PRed, fixed now
 2017-11-05 22:53:11 -06:00
Anewbe
35fc43d579 Merge pull request #4112 from Woodratt/WR_10192017 
High Capacity Water Tanks
 2017-11-05 20:11:23 -06:00
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
elgeonmb
8560a35ec3 fixed megaphone lore 2017-11-04 01:59:00 -07:00
Anewbe
7e62570129 Merge pull request #4205 from MisterLayne/LostDroneCharger 
Lost Drone Pod Charger
 2017-11-03 23:38:43 -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
516b7e7c2d Merge pull request #4206 from Cyantime/windos 
Minor window fixes
 2017-11-03 16:11:27 -05:00
Mechoid
f538c584e6 Merge pull request #4191 from Anewbe/ling_sting 
Ling Stings no longer affect FBPs
 2017-11-03 13:15:48 -07: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
MisterLayne
2be106026b Makes lost drone pod charger-able. 2017-11-03 14:26:59 -04:00
Mechoid
d81b1b2cba Merge pull request #4108 from Anewbe/more_dangerous_voidsuits 
Voidsuits breach more easily
 2017-11-03 08:47:27 -07:00
Cyantime
31f5321dcc Window things 2017-11-02 23:58:20 -04:00
Anewbe
303b7096ef Merge pull request #4194 from Mechoid/Welderpack_Tanks 
Adds a mounted welder to the welderpacks in Engineering.
 2017-11-02 20:38:10 -05: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
Anewbe
35ef57705a Merge pull request #4197 from Atermonera/ATC_stat 
ATC ships won't go to the current station
 2017-11-01 21:47:54 -05:00
Anewbe
1d19fbe59c Ling stings can't affect synthetics now 2017-11-01 20:51: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
Mechoid
794bd0ab6f Adds a mounted welder to the welderpacks in engineering. 2017-10-31 20:07:14 -07:00
Wickedtemp
a3ba6ff5d9 Update hypospray.dm 2017-10-31 20:52:02 -05:00
Anewbe
73ad06c706 Botanist ID now has the proper default job/title 2017-10-31 20:41:15 -05:00
mistyLuminescence
eef59a1bbc tweaks v2 2017-10-31 20:49:17 +00:00
Atermonera
4e191a2bd7 improper sleeper 2017-10-31 09:41:05 -07:00
mistyLuminescence
f67a3858cd Plushie tweaks! 2017-10-31 15:47:00 +00:00
Anewbe
396fea0365 Merge pull request #4186 from Woodratt/10302017_ArlShtlefix 
SC Arrivals Shuttle fix
 2017-10-31 10:28:05 -05: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