cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-05 23:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,770 Commits 2 Branches 1 Tag
fac13bfebdab99b60ea3cdb4257cd5bba2af444f
Commit Graph

2269 Commits

Author SHA1 Message Date
redstryker
ac81a5003c Examine Cigarette Lore 2016-08-28 16:04:07 -04:00
Yoshax
f7c459d796 Merge pull request #2357 from SinTwo/framecleanup2 
Frame Cleanup + Machinery Code Cleanup
 2016-08-28 18:31:16 +01:00
SinTwo
a2a2f58e93 Fixes #2352 2016-08-27 13:44:32 -04:00
SinTwo
fa92cdeeda Merge branch 'master' of https://github.com/PolarisSS13/Polaris into framecleanup2 2016-08-23 18:33:51 -04:00
Anewbe
54f8725c83 Smokables now give an approximation of how much longer they'll burn once lit 2016-08-23 00:08:18 -05:00
Neerti
9177ab31cc Merge pull request #2327 from SinTwo/bugfixbugaloo 
Fixes
 2016-08-15 18:19:05 -04:00
SinTwo
265eaba34f Fixes #2122 2016-08-15 11:25:00 -04:00
SinTwo
cba8cdcde8 Fixes #2036 2016-08-15 10:38:32 -04:00
Yoshax
d206f0d80d Actually allows IDs to be put ~~in~~ on your ears 2016-08-15 13:58:42 +01:00
Anewbe
0cb1f8c27a Cleans up the code to match recent Tajaran rewrite 2016-08-13 23:07:00 -05:00
SinTwo
045c393683 Revert "Revert "Frame Cleanup"" 
This reverts commit 82722ba42f.
 2016-08-13 19:55:57 -04:00
Kelenius
d0a0a64722 Merge branch 'master' into fuckCael 2016-08-08 18:41:18 +03:00
Neerti
1a27f41076 Merge pull request #2282 from Yoshax/low-end-combat 
Item force tweaks
 2016-08-08 07:24:24 -04:00
EmperorJon
8110fbbf3c Merge pull request #2232 from SinTwo/scheduler 
510 scheduler
 2016-08-08 10:36:36 +01:00
Yoshax
058b6f1aa3 Further weapon force tweaks 2016-08-07 15:00:25 +01:00
Kelenius
93d07036ef Rewrites xenoarch 
See changelog
 2016-08-07 08:26:26 +03:00
Yoshax
60c4fb436c no message 2016-08-07 01:39:55 +01:00
Yoshax
403c9adcdb Low/er end combat force adjustments 2016-08-07 01:31:45 +01:00
Yoshax
82722ba42f Revert "Frame Cleanup" 2016-08-06 00:27:03 +01:00
Yoshax
afa7878abb Merge pull request #2263 from SinTwo/frame_cleanup 
Frame Cleanup
 2016-08-05 21:14:35 +01:00
SinTwo
279cbdfafe more icon fixes 2016-08-03 14:10:29 -04:00
SinTwo
07b4eb2d95 final fixes, tweaks, and cleanups 2016-08-03 14:09:12 -04:00
SinTwo
b42d46205f more time proc call fixes 2016-07-30 17:39:47 -04:00
SinTwo
4f7ea573c1 world time fix 2016-07-30 03:19:47 -04:00
woodratt
4a4b481d32 Grenade Buff 
Tweaked the code some, changed the number of fragments spawned from 50 to 63. Damage remains the same, fragments now have a thirty percent armor pen. This also means that how lethal grenades are has gone up by a lot. One landing at your feet is lethal. Standing next to one will seriously hurt. Tile or two back the dropoff is still in effect.

Basically need some live testing in round with real folk to get a idea of how bad or good this will be. Will likely need to tweak the damage downwards instead of upwards.
 2016-07-27 17:05:17 -07:00
Yoshax
29ad42fea7 Does some stuff 2016-07-27 05:11:12 +01:00
Yoshax
829ac652b4 Re-add package bombs 2016-07-26 20:18:39 +01:00
SinTwo
8eae6a7dee (hopefully) last name tweak 2016-07-25 19:50:19 -04:00
Neerti
fc762a6e83 Merge pull request #2189 from SinTwo/item_state 
Icon Fix Fun Time
 2016-07-24 19:21:09 -04:00
SinTwo
1a6504a47c more item_state fixes: worn_state purge 2016-07-24 19:03:15 -04:00
Anewbe
89e98a39fb Merge pull request #2181 from Yoshax/uplinkcosttweaks 
Uplink cost tweaks
 2016-07-24 17:13:03 -05:00
Anewbe
79fda58e47 Merge pull request #2185 from SinTwo/item_state 
Item State Cleanup Fix
 2016-07-23 23:32:27 -05:00
SinTwo
8e9676aa26 storage item item_state fix 2016-07-24 00:19:45 -04:00
SinTwo
66c3a007a9 frame cleanup fixes 2016-07-23 23:45:24 -04:00
Anewbe
612a6f8328 Merge pull request #2149 from SinTwo/item_state 
Item State Cleanup
 2016-07-23 15:53:36 -05:00
Yoshax
305255d2ee Adjusts uplink item costs 2016-07-23 21:00:53 +01:00
Yoshax
93b7e661c4 Ensures contraband for supply computers can be properly acquired via hacking 2016-07-23 20:24:04 +01:00
SinTwo
eb120319eb Frame code cleanup 2016-07-23 13:31:30 -04:00
SinTwo
4bff201f8b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state 
Conflicts:
	code/game/objects/items/devices/telecrystal.dm
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
 2016-07-22 23:39:19 -04:00
Yoshax
3f0a95ae3a Ensures there's no funny business with powering up emags 2016-07-22 23:05:54 +01:00
Yoshax
21f856ed47 Multiplies all Telecrystal stuff by ten to setup for fine cost adjusting 2016-07-22 17:35:20 +01:00
EmperorJon
683bba42ee Merge pull request #2135 from Anewbe/dual-wield_unathi 
Unathi knives can now be wielded in unison
 2016-07-20 12:11:21 +01:00
SinTwo
c1bd0aa6b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state 
Conflicts:
	code/modules/clothing/clothing.dm
 2016-07-19 17:37:14 -04:00
SinTwo
b4f85ff533 cleanup and fixes 2016-07-19 17:25:45 -04:00
Mark9013100
67279bf012 Allows belts to hold all tape rolls 2016-07-18 22:24:18 -04:00
Anewbe
9cfc9222d6 Corrects the way stunbatons check for charge on attack 2016-07-16 23:05:06 -05:00
Anewbe
a79c8d8768 Unathi knives can now be wielded in unison 2016-07-14 18:14:58 -05: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
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