cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-20 15:12:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,777 Commits 2 Branches 1 Tag
8edec2a5d1c8d85405b51dfaec2eee11e0644b78
Commit Graph

14107 Commits

Author SHA1 Message Date
redstryker
61ab92c7f6 Adds all of the winter coats to the loadout. 2016-04-22 10:03:18 -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
Nerezza
4c7537e180 Makes opening/closing pizza boxes easier 
Alt-click now opens/closes pizza boxes like a laptop.
 2016-04-21 21:43:32 -05: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
Yoshax
0353ac2238 Makes cheongasm loadout selection clearer 2016-04-22 01:17:11 +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
Yoshax
c77a7d4c00 Makes cheongasms use fancy loadout tweak stuff 2016-04-21 22:29:30 +01:00
Datraen
4212acdc58 Makes slimes less annoying, xenos now translate messages. 
Translation is as a result of say code being extra fun.
 2016-04-21 16:40:59 -04:00
Yoshax
9e2119a873 Adds different colored cheongsams 2016-04-21 21:28:34 +01:00
Ccomp5950
574b08d703 Slimes and Parrots now hear_say 
Removes the recursive bullshit that was put in living/say() that isn't needed.

Fixes #12063  http://i.imgur.com/lsb983N.png
 2016-04-21 13:57:24 -04:00
Datraen
11a6e74ea9 Fix reagent handling, magic numbers, other errors. 2016-04-21 13:39:52 -04:00
Nerezza
42eaadb4e5 Skrell can speak Schechi instead of Teshari now 2016-04-21 12:02:35 -05:00
Datraen
f09304c508 Adds the new xeno mob system, implemented with slimes. 2016-04-21 11:05:18 -04: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
Yoshax
aa592e3b35 Gender tweaking 
Limits biolgical gender by species and defaults to male/female.
Can also set gender identity which determines which is displayed upon examination and suchlike along with being shown in medical records
 2016-04-20 20:07:14 +01: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
Yoshax
0577738032 Character setup gender selection changes 
Different species now have different gender selections available.
 2016-04-20 16:27:55 +01: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
Neerti
3c92193bf5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/30/2016_dumb_gun_balance 
# Conflicts resolved:
#	code/modules/projectiles/projectile/beams.dm
 2016-04-20 05:41:36 -04: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