cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 09:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,877 Commits 2 Branches 1 Tag
fd007cdea0e38953a2ba9b9bc2bf903b51cf63db
Commit Graph

12278 Commits

Author SHA1 Message Date
mwerezak
880f82935f Implements lighting rags on fire 
Rags can be lit on fire if soaked with welder fuel. While lit, the rag provides light, starts fires, and attacking mobs will ignite them.
Rags can be put out by clicking in hand.
Rags will burn out after a short time, turning into ash.
 2015-08-13 18:37:14 -04:00
mwerezak
b5425e0bd9 Makes beer and ale bottles into actual bottles, adjusts bottle smashing 
Generalizes opening drink containers, makes beer and ale bottles a subtype of bottle instead of can
Adjusts bottle smashing, duration, damage, and reliability.
 2015-08-13 18:37:13 -04:00
mwerezak
7198f98058 Improves support for rags as reagent containers 
Rags now hold just under half a glass worth of reagents.
Fixes rags wiping down a mob while smothering them.
Rags can now be wrung out over a container or the floor, emptying it's
contents.
When wiping down stuff, a small amount of the rag's contents are
splashed onto the atom.
 2015-08-13 18:32:51 -04:00
mwerezak
5ae15e222c Bottles smash when thrown using harm intent 
Throwing a glass bottle at something nearby on harm intent causes it to smash, splashing it's contents over whatever it hits.
If the hit atom is too far away the bottle will not smash. Also it does not smash with 100% reliability.
 2015-08-13 18:32:50 -04:00
HarpyEagle
afa878e993 Adjusts breacher desc, comments 2015-08-13 18:21:57 -04:00
mwerezak
c4ed6a10aa Merge pull request #10609 from PsiOmegaDelta/150813-ReagentQdel 
qdel(reagent) adjustments.
 2015-08-13 12:35:08 -04:00
PsiOmegaDelta
f95efdc0a1 Merge pull request #10612 from Raptor1628/master 
Fixes Grenade Launcher module sprite again
 2015-08-13 17:08:36 +02:00
Chinsky
cce6c3ce2d Merge pull request #10026 from Zuhayr/dronehats 
Added hats for drones.
 2015-08-13 17:49:03 +03:00
Chinsky
3b500d4076 Merge pull request #10279 from Kearel/LibraryModifications 
Library modifications
 2015-08-13 17:47:16 +03:00
Raptor1628
0274f87172 Fixes Grenade Launcher module sprite again 
It didn't stick last time, so let's go again!
 2015-08-13 10:11:11 -04:00
Zuhayr
cc340831e2 Merge pull request #10304 from GinjaNinja32/follow 
Better follow code
 2015-08-13 18:39:20 +09:30
PsiOmegaDelta
d1e8f670b2 qdel(reagent) adjustments. 
Attempts to ensure qdel(reagents) only occur once per Destroy()
 2015-08-13 10:26:31 +02:00
PsiOmegaDelta
62155433c2 Merge corrections. 
Fixes the todo:s I claimed I'd fix at merge.
 2015-08-13 10:17:03 +02:00
Zuhayr
4674333143 Minor holder refactor. 2015-08-13 17:31:42 +09:30
Zuhayr
ab49ac0d6d Adds hats to dionaea. 2015-08-13 17:31:41 +09:30
Zuhayr
2f6a1f2830 Added hats for drones. 2015-08-13 17:31:40 +09:30
Zuhayr
e362e13433 Merge pull request #10605 from PsiOmegaDelta/150813-TypoFix 
Typo fix.
 2015-08-13 17:01:25 +09:30
PsiOmegaDelta
e1db48e50f Typo fix. 
Minor typo fix: Unladed to unloaded.
 2015-08-13 09:26:41 +02:00
PsiOmegaDelta
efef67a3e4 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-13 09:11:05 +02:00
PsiOmegaDelta
1b10f78940 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-08-13 09:01:10 +02:00
Kelenius
3b1b8a33c6 Merge branch 'dev' into ofSleepersAndNano 
Conflicts:
	maps/exodus-1.dmm
	maps/exodus-2.dmm
	maps/exodus-3.dmm
 2015-08-13 09:49:34 +03:00
PsiOmegaDelta
ccf6fa285d Removes Flesh to Stone fully. 
Fixes #10600.
 2015-08-13 08:25:03 +02:00
Kelenius
d8d94b9d64 Merge branch 'dev' into ofSleepersAndNano 
Conflicts:
	code/game/machinery/Sleeper.dm
	maps/exodus-1.dmm
 2015-08-13 09:20:51 +03:00
Kearel
93959dc83d Changelog + scrambled paper 2015-08-13 01:16:00 -05:00
PsiOmegaDelta
c63f4c62b5 Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney 
Conflicts:
	code/__defines/mobs.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job_controller.dm
 2015-08-13 08:06:11 +02:00
Kelenius
65a9e11a52 Merge branch 'dev' into ofBeesAndHoney 
Conflicts:
	baystation12.dme
 2015-08-13 08:33:46 +03:00
GinjaNinja32
b7964c2f4a Missed a couple of t_ variables 2015-08-13 06:02:38 +01:00
GinjaNinja32
477a9b8dba Merge remote-tracking branch 'upstream/dev' into client_dir 2015-08-13 05:55:05 +01:00
GinjaNinja32
f52d48c91f Merge remote-tracking branch 'upstream/dev' into follow 
Conflicts:
	.travis.yml
 2015-08-13 05:54:30 +01:00
GinjaNinja32
cde0f889c7 Merge remote-tracking branch 'upstream/dev' into gender 
Conflicts:
	code/modules/mob/living/carbon/human/examine.dm
 2015-08-13 05:52:51 +01:00
GinjaNinja32
38f711b7c6 Merge remote-tracking branch 'upstream/dev' into jumpskirt 2015-08-13 05:39:27 +01:00
Chinsky
ac80136603 Merge pull request #10184 from mwerezak/projectile-cleanup 
Projectile code cleanup
 2015-08-13 07:26:58 +03:00
Chinsky
f7ccf47f06 Merge pull request #10030 from GinjaNinja32/languages 
Reworks character creation language selection
 2015-08-13 07:23:44 +03:00
Chinsky
89659c99fc Merge pull request #10001 from PsiOmegaDelta/150702-MaskRefactor 
Refactors mask voice changes.
 2015-08-13 07:23:27 +03:00
Chinsky
fc14ec9fca Merge pull request #9883 from mwerezak/ert-lights 
Adds more coloured lights
 2015-08-13 07:22:45 +03:00
Chinsky
21f7c8234d Merge pull request #10473 from mwerezak/firemode-cleanup 
Streamlines gun fire modes
 2015-08-13 07:22:28 +03:00
GinjaNinja32
98c2a0c8b1 Merge pull request #10594 from mwerezak/embed-fix 
Embedding and broken limb fixes
 2015-08-13 04:52:20 +01:00
mwerezak
1dc853710c Implant items do not count for continuing to process embedded objects 
Also makes embedded pain messages respect NO_PAIN.
 2015-08-12 23:38:44 -04:00
mwerezak
99e1d88285 Fixes #10592 
Fixes the right hand being affected if the left arm was broken.
 2015-08-12 22:41:30 -04:00
mwerezak
62ad3a7be4 Fixes #10593 
Adds a embedded_needs_process() proc to determine if the mob has embedded objects that still need to be processed. The get_visible_implants() remains to determine which implants can be seen on examine and yanked out.
 2015-08-12 22:24:14 -04:00
GinjaNinja32
792d6e2864 Merge pull request #10579 from mwerezak/misc 
Fixes
 2015-08-12 22:21:34 +01:00
HarpyEagle
74f9e6ce63 Fixes #10552 2015-08-12 16:45:45 -04:00
HarpyEagle
7a86d6e658 Fixes #10571 
Adds another snowflake electronic item to the can_hold list.
 2015-08-12 16:06:31 -04:00
HarpyEagle
19fbc71249 Removes req_amount from stack_recipe_list 
The stack_recipe_list datum itself is not used to make anything, so having
a req_amount made little sense. Fixes #10572.
 2015-08-12 15:54:16 -04:00
HarpyEagle
3e6889927e Fixes #10500 2015-08-12 15:26:57 -04:00
HarpyEagle
a43f77b070 Gives hydro soil recipe a better name 
Gives the hydro soil recipe a name that better conveys it's purpose.
 2015-08-12 15:25:01 -04:00
PsiOmega
ba240cb768 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/spaceheater.dm
	code/modules/clothing/head/soft_caps.dm
	maps/exodus-5.dmm
 2015-08-12 21:18:18 +02:00
mwerezak
5b6c5ee5ce Merge pull request #10570 from Zuhayr/master 
Couple of fixes.
 2015-08-12 15:00:36 -04:00
Zuhayr
5f17cf4397 Merge pull request #10568 from SparklySheep/patch-14 
Fixes #10532
 2015-08-13 04:18:23 +09:30
Zuhayr
64a89fc5e4 Removes seed colour from nymphs. 2015-08-13 03:33:28 +09:30