cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-20 23:21:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,289 Commits 2 Branches 1 Tag
918e65b7b91b985752ecfcaf912c7840b6e6d707
Commit Graph

23369 Commits

Author SHA1 Message Date
SinTwo
918e65b7b9 finished clothes (mostly) 2016-07-13 21:39:42 -04:00
SinTwo
976847a0b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state 
Conflicts:
	code/modules/clothing/head/jobs.dm
	icons/mob/items/lefthand.dmi
	icons/mob/items/righthand.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/items.dmi
 2016-07-13 17:07:52 -04:00
SinTwo
1a400eb2cb pre-merge commit 2016-07-13 16:18:58 -04:00
Yoshax
dc7f0d6434 Merge pull request #2126 from Neerti/7/13/2016_health_hud_fix 
Health Hud Prosthetics Fix
 2016-07-13 20:07:16 +01:00
Neerti
bfd838fd5c Health Hud Prosthetics Fix 
Adds two lines of code I forgot to port, hopefully should make the prosthetic icons for the HUD be correct now.
 2016-07-13 14:46:21 -04:00
Neerti
334f24730e Merge pull request #2124 from Yoshax/hair 
Adds a new hairstyle
 2016-07-13 14:41:46 -04:00
Neerti
eeb234cf2a Merge pull request #2114 from Yoshax/CargoConsoleFix 
Ensures cargo consoles can be properly emagged
 2016-07-13 14:40:06 -04:00
Neerti
e5d24b1655 Merge pull request #2125 from Yoshax/runtimefi 
Fixes 3 runtimes due to a null
 2016-07-13 14:39:11 -04:00
Neerti
f2e0462dcb Merge pull request #2123 from Yoshax/languages 
Makes languages great again
 2016-07-13 14:38:33 -04:00
Yoshax
f86cbfd6df Fixes a runtime due to a null 2016-07-13 18:39:44 +01:00
Yoshax
f2f6ca54f2 Adds a new hairstyle 2016-07-13 18:34:46 +01:00
Yoshax
402e046576 Fixes languages not being properly added to mobs 2016-07-13 18:12:15 +01:00
Yoshax
cda6508001 Merge pull request #2119 from Anewbe/burning_bodies 
Burning bodies no longer burn forever
 2016-07-13 17:13:16 +01:00
Yoshax
3df18c2870 Merge pull request #2111 from Serithi/LAVENDER_UNBORKIFICATION 
Properly alphabetizes lavender in the vending machines.
 2016-07-13 17:10:10 +01:00
Anewbe
b08ddfefff Fixes lighters being able to ignite people while off. 2016-07-12 22:13:04 -05:00
SinTwo
91b6ca3d7b item states are awful 2016-07-12 23:02:29 -04:00
Anewbe
811a7be362 fire_stacks decrease over time 2016-07-12 21:27:04 -05:00
Neerti
f7d8f2cb58 Merge pull request #2118 from Woodratt/1.5.5_fancyuniforms 
1.5.5 Fancy Green Uniforms
 2016-07-12 21:17:07 -04:00
woodratt
47ab279b9b 1.5.5 Fancy Green Uniforms 
- Adds, one green suit and formal jacket.
- One new military like jacket that can be selected from the loadout.
- A new holster type, leg holster. Can be selected from the loadout as well.
- Cleaned up a couple of the sprites for outfits that have ties (rolled up sleeve versions on a couple still had the tie sprite).
 2016-07-12 17:19:39 -07:00
Anewbe
124fe62c55 Allows admins to call an ERT without the announcement 2016-07-12 19:02:16 -05:00
Yoshax
f5b1d73ba2 Ensures cargo consoles can be properly emagged 2016-07-12 20:01:50 +01:00
Serithi
8ad6f5e626 Properly alphabetizes lavender in the vending machines. 2016-07-11 20:16:56 -07:00
SinTwo
7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
Yoshax
defde9673a Merge pull request #2087 from Anewbe/borg_lives_matter 
Removes the Robot Console's ability to blow up borgs
 2016-07-11 19:55:34 +01:00
Yoshax
d4e8589d8f Ports Mloc's HUD fixes from Bay and further fixes ours because of code differences 2016-07-11 16:35:21 +01:00
Neerti
8307cff728 Merge pull request #2106 from Yoshax/ammo_states 
Add more states to 10mm mag sprites
 2016-07-11 04:07:52 -04:00
Neerti
f9cfdebb45 Merge pull request #2105 from Yoshax/spookyghosts 
Refactors wipe_core(), extends function to pAIs
 2016-07-11 04:07:44 -04:00
Neerti
a57bdc3512 Merge pull request #2100 from Yoshax/antagselection 
Ensures voices are not selected for auto-antag roles
 2016-07-11 04:06:53 -04:00
Neerti
a8c98dec05 Merge pull request #2101 from Yoshax/advwhofix 
Ensures advanced who entries arent duplicated for admins
 2016-07-11 04:05:27 -04:00
Neerti
4a06606acc Merge pull request #2102 from Anewbe/paralyze 
Creates a prompt on unparalyze
 2016-07-11 04:05:18 -04:00
Neerti
3e347605b5 Merge pull request #2103 from Yoshax/pepper 
Fixes pepperspray making sounds even when the safety is on
 2016-07-11 04:05:04 -04:00
Daranz
c0bfd668bb Rename '12mm' to '10mm' in sprites 
Round is already referred to as '10mm' everywhere else.
 2016-07-11 05:22:23 +01:00
Kasuobes
0471e7e0c4 Refactors silicon job slot/tater cleanup (#1) 
* Refactors silicon job slot/tater cleanup

Moved from ai/verb/wipe core to silicon/proc.

* Adds wipe_software verb for pAI

Let pAI ghost properly, calls silicon/proc/clear_client()

* Refactors silicon job slot/tater cleanup
 2016-07-11 05:17:30 +01:00
Kasuobes
fabdf3d782 Adds delete_personality verb for pAI 
Ported over from AI's wipe_core verb, allow pAIs to ghost and leave the round properly in case nobody wipes the pAI device.
 2016-07-11 05:13:30 +01:00
Yoshax
4b7c2ddf77 De-pubifies the server 2016-07-11 05:02:00 +01:00
mwerezak
108a748d1f Fixes pepperspray making sounds even when the safety is on 2016-07-11 04:54:40 +01:00
Yoshax
5053cb24a5 Ensures advanced who entries arent duplicated for admins 2016-07-11 04:44:08 +01:00
Yoshax
08dcd9ddcb Ensures voices are not selected for auto-antag roles 2016-07-11 04:25:21 +01:00
Anewbe
2978f5093b Creates a prompt on unparalyze 2016-07-10 20:58:08 -05:00
EmperorJon
64edc40839 Merge pull request #2090 from Neerti/7/10/2016_limb_hud_bay_port 
New Limb HUD System, from Bay
 2016-07-10 13:26:25 +01:00
EmperorJon
cc869bdb68 Merge pull request #2096 from Neerti/7/10/2016_mining_booms 
Explosive Mining!
 2016-07-10 13:26:19 +01:00
Neerti
d8635e4632 Removes world << debug. 2016-07-10 08:16:59 -04:00
Neerti
3a308cc8db Merge pull request #2095 from Anewbe/wardem 
Corrects a "Wardem" misspelling
 2016-07-10 08:09:46 -04:00
Neerti
38b564ee5b Explosive Mining! 
Explosions can now expose ore from underneath asteroid turf, so now Toxins has an actual use besides griefing.  The amount of ore you get depends on the same circumstances as drilling down, however explosions tend to cause some loss in minerals obtained.  Hopefully the vastly faster method of exploding the asteroid instantly will prove to be viable.
 2016-07-10 08:06:56 -04:00
Anewbe
0396675865 Corrects a "Wardem" reference 2016-07-10 07:01:31 -05:00
Neerti
814f59cf29 New Limb HUD System, from Bay 
Manually ports https://github.com/Baystation12/Baystation12/pull/13530, and https://github.com/Baystation12/Baystation12/pull/13561 from bay.
Adjusts the scaling on the coloration, since it seems Bay has different shading than us for species, otherwise some species would be dark, and others would be superbright.
Credit goes to Zuhayr for the code.
 2016-07-10 06:22:44 -04:00
EmperorJon
32129232b7 Merge pull request #2086 from Neerti/7/10/2016_freezer_fixes 
Freezer Fixes
 2016-07-10 10:56:59 +01:00
EmperorJon
dbea018ffe Merge pull request #2085 from Neerti/7/10/2016_washing_machines 
Cleans up washing machines a bit
 2016-07-10 10:56:38 +01:00
EmperorJon
e809fb79f6 Merge pull request #2088 from Anewbe/ling_stomach_pump 
Anatomic Panacea clears ingested reagents
 2016-07-10 10:54:41 +01:00
Anewbe
efc20b7108 Anatomic Panacea clears ingested reagents 2016-07-10 03:39:51 -05:00