cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 01:52:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,160 Commits 2 Branches 1 Tag
3ae1f9ed785fa6adf89f8d68a73663f15bc56d39
Commit Graph

13793 Commits

Author SHA1 Message Date
HarpyEagle
3ae1f9ed78 Updates more instances of blocked<2 or /=(blocked+1) 
Removes facehugger source code file
 2016-04-22 21:04:31 -04:00
HarpyEagle
03761c5eed Compile fixes 2016-04-22 04:58:26 -04:00
HarpyEagle
5543209bbd Fix macro 2016-04-22 04:58:25 -04:00
mwerezak
28192c6675 Adds cooldowns to eating/feeding, allows attacking with reagent containers while on harm intent. 2016-04-22 04:58:25 -04:00
mwerezak
4951790b50 Fixes missing cooldowns, missing cult blade sound. 
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
 2016-04-22 04:58:25 -04:00
mwerezak
deb215d262 Refactors bottle smashing, apply_hit_effect() now returns the blocked status. 
Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
 2016-04-22 04:57:23 -04:00
mwerezak
c0ac25ec4b Refactors robolimb emagging, fixes emag resolve_attackby not passing emag_source 2016-04-22 04:57:23 -04:00
mwerezak
11c5b10bb9 Refactors various item attack() implementations 
Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.

Conflicts:
	code/game/objects/items/weapons/clown_items.dm
	code/game/objects/items/weapons/material/kitchen.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2016-04-22 04:57:22 -04:00
mwerezak
593f7699db Refactors item_attack.dm 
Refactors and cleans up item_attack.dm and related mob attack code

Conflicts:
	code/_onclick/item_attack.dm
	code/game/objects/items.dm
	code/modules/mob/living/bot/bot.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2016-04-22 04:52:04 -04:00
Neerti
069e9c7e68 Merge pull request #1470 from Hubblenaut/smes 
Changes to SMES Interface
 2016-04-21 21:09:42 -04:00
Neerti
6d15cb3731 Merge pull request #1472 from Yoshax/paifix 
Stops pAIs from dragging people, corpses, etc
 2016-04-21 21:08:33 -04:00
Neerti
2a946fc23d Merge pull request #1243 from Kelenius/cleanupTwo 
Mob inventory cleanup, part 2
 2016-04-21 21:07:22 -04:00
Yoshax
78d8caed83 Stops pAIs from dragging people, corpses, etc 2016-04-22 01:33:25 +01:00
Hubblenaut
3d9a558712 Changes to SMES 
- Transition to using kilowatts and kilowatt hours
 - Adds an input load bar with value
 - SMES charge rate and coil capacities slightly adjusted for using
   kilowatt units
 2016-04-22 00:58:11 +02:00
Nerezza
42eaadb4e5 Skrell can speak Schechi instead of Teshari now 2016-04-21 12:02:35 -05:00
Kelenius
98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
Anewbe
40ce9dc904 Gives Breacher helmets force 5, makes their headbutts more dangerous 2016-04-20 22:10:44 -05:00
Neerti
a1faf6e497 Merge pull request #1428 from ParadoxSpace/DionaLightFix 
Fixes Diona Light Gain
 2016-04-20 12:12:45 -04:00
Datraen
2b53efdfd5 Merge pull request #1303 from Hubblenaut/hydro 
Full fertilizer bottles of type glass/bottle
 2016-04-20 11:31:31 -04:00
HarpyEagle
6b7d40b75f Fixes confused movement for walking/running, adjusts behaviour 2016-04-20 16:49:33 +02:00
HarpyEagle
bf3253ca28 Running into things while confused Weakens instead of Paralyzes. 
Fixes incorrect use of take_organ_damage
 2016-04-20 16:49:14 +02:00
PsiOmegaDelta
a3f8bc815e Round start timer now remains at 0 until the round actually starts. 2016-04-20 15:27:59 +01:00
EmperorJon
ebeaddea6e Merge pull request #1414 from Mark9013100/4/15/2016tank_grammar 
Fixes some punctuation
 2016-04-20 13:23:51 +01:00
EmperorJon
8d2370bd65 Merge pull request #1445 from Anewbe/veymed_prosthetics 
Adds Vey-Med prosthetic limbs.
 2016-04-20 13:23:07 +01:00
EmperorJon
7b793634b2 Merge pull request #1451 from SinTwo/minimalist-ui 
Adds a new UI style - Minimalist
 2016-04-20 13:22:55 +01:00
EmperorJon
8596e303e3 Merge pull request #1430 from mwerezak/living-life-fix-polaris 
Human Life Fixes
 2016-04-20 13:22:18 +01:00
Hubblenaut
2b44de88b1 Change to absolute pathing 2016-04-20 13:21:35 +02:00
SinTwo
57b8808a53 Adds a new UI style 
minimalist.dmi
 2016-04-19 21:46:19 -04:00
Datraen
c6f2b0f76d Merge pull request #1447 from Yoshax/safetyfiring 
Fixes a typo on the new preference
 2016-04-19 21:12:35 -04:00
Yoshax
4e8ac2515d Further fixes typos 2016-04-19 23:49:57 +01:00
Yoshax
7ae719aea7 Fixes a typo on the new prefence 2016-04-19 23:09:54 +01:00
Datraen
a3df9e6eba Merge pull request #1429 from Yoshax/safetyfiring 
Adds a new verb/preference to toggle requirting help intent to fire weapons
 2016-04-19 11:44:53 -04:00
Anewbe
29b9935411 Adds Vey-Med prosthetic limbs. 2016-04-18 18:50:54 -05:00
EmperorJon
47f715805e Merge pull request #1442 from Yoshax/drinksloadout 
Loadout (vacuum-)flask contents now configurable.
 2016-04-18 16:33:42 +01:00
Yoshax
f0c69e663d Fixes error 2016-04-18 15:53:09 +01:00
PsiOmegaDelta
2e6f2c53a6 Loadout (vacuum-)flask contents now configurable. 
Can now prefill the loadout flask and vacuum-flask with a relevant liquid of your choice.
 2016-04-18 15:30:26 +01:00
HarpyEagle
03c2ace543 Fixes #11520 
Makes overdosing check volume instead of amount metabolised as its criteria
 2016-04-18 15:16:31 +01:00
Datraen
12c9156098 Fixes Teshari smocks, updates changelog. 2016-04-17 17:07:53 -04:00
HarpyEagle
6ff230c3cc Fixes paralysis not causing stat = UNCONSCIOUS 2016-04-17 01:22:15 -04:00
mwerezak
e3e67fd48a Fixes #12634 2016-04-16 17:30:28 -04:00
HarpyEagle
adf56aad82 And some more excessive processing 2016-04-16 17:30:24 -04:00
HarpyEagle
0488a54297 Removes another excessive AdjustParalysis(-1) 2016-04-16 17:30:23 -04:00
HarpyEagle
abd5b98343 Fixes #12613 
handle_statuses() is now called from living/Life() instead of from handle_regular_status_updates(), replacing the call from handle_status_effects()
 2016-04-16 17:30:23 -04:00
ParadoxSpace
ec5401036f Update life.dm 2016-04-16 13:33:13 -06:00
Yoshax
ff96d27a85 Adds a new verb that allows users to toggle the requiring help intent to fire weapons on or off 2016-04-16 18:30:35 +01:00
ParadoxSpace
c56bda0eed Update life.dm 2016-04-16 10:38:38 -06:00
EmperorJon
ff6526d5a3 Merge pull request #1424 from Neerti/4/16/2016_aim_intent_changes 
Aim Intent Changes
 2016-04-16 17:13:16 +01:00
EmperorJon
61684db81d Merge pull request #1425 from Neerti/4/16/2016_eye_color_verb 
Adds verb to change eye color at will (if mechanical)
 2016-04-16 17:12:36 +01:00
Neerti
69a4242b17 Inventory Tweaks 1 
Evidence bags should no longer start empty.
Reduces maximum width for the inventory background slightly.
Makes a new, slimmer to close the inventory.  This and the maximum width reduction mean the inventory should never overlap with other UI buttons.
 2016-04-16 10:28:14 -04:00
Neerti
3667780871 Adds verb to change eye color at will (if mechanical) 
Adds a verb used by humanoid mobs that have mechanical eyes, which allows them to pick a new color, and have it applied instantly.
Adds some helper functions, specifically hex2rgb(), to convert hexadecimal colors to a list of numbers for r, g, and b.
 2016-04-16 06:14:09 -04:00