045c393683
Revert "Revert "Frame Cleanup""
...
This reverts commit 82722ba42f
2016-08-13 19:55:57 -04:00
d0a0a64722
Merge branch 'master' into fuckCael
2016-08-08 18:41:18 +03:00
1a27f41076
Merge pull request #2282 from Yoshax/low-end-combat
...
Item force tweaks
2016-08-08 07:24:24 -04:00
8110fbbf3c
Merge pull request #2232 from SinTwo/scheduler
...
510 scheduler
2016-08-08 10:36:36 +01:00
058b6f1aa3
Further weapon force tweaks
2016-08-07 15:00:25 +01:00
93d07036ef
Rewrites xenoarch
...
See changelog
2016-08-07 08:26:26 +03:00
85c3e22873
Polaris sync
2016-08-06 20:34:44 -07:00
60c4fb436c
no message
2016-08-07 01:39:55 +01:00
403c9adcdb
Low/er end combat force adjustments
2016-08-07 01:31:45 +01:00
7907de5974
Merge pull request #2173 from Yoshax/telecrystalfun
...
Adds telecrystal teleporting
2016-08-06 20:23:50 -04:00
623cb52e84
Grammar typo fix
2016-08-07 00:51:33 +01:00
82722ba42f
Revert "Frame Cleanup"
2016-08-06 00:27:03 +01:00
afa7878abb
Merge pull request #2263 from SinTwo/frame_cleanup
...
Frame Cleanup
2016-08-05 21:14:35 +01:00
279cbdfafe
more icon fixes
2016-08-03 14:10:29 -04:00
07b4eb2d95
final fixes, tweaks, and cleanups
2016-08-03 14:09:12 -04:00
6423aa6330
Should remove flickering heat warning for FBPs and suit coolers
2016-08-01 22:06:26 -05:00
3795e5c52a
Suit coolers now work while worn on the back
2016-07-31 00:15:42 -05:00
b42d46205f
more time proc call fixes
2016-07-30 17:39:47 -04:00
4f7ea573c1
world time fix
2016-07-30 03:19:47 -04:00
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
29ad42fea7
Does some stuff
2016-07-27 05:11:12 +01:00
829ac652b4
Re-add package bombs
2016-07-26 20:18:39 +01:00
66f373d313
Merge pull request #2208 from SinTwo/itme_state_cleanup
...
Icon Name Fixes
2016-07-25 22:11:20 -05:00
8eae6a7dee
(hopefully) last name tweak
2016-07-25 19:50:19 -04:00
7fbb123a4d
Improves/fixes surplus crate item selection
2016-07-25 23:13:12 +01:00
f19c922984
Improves surplus crates
2016-07-25 21:45:54 +01:00
9467b103bb
Merge pull request #2197 from Yoshax/uplinkreduxboogalodiscount
...
Reduces antag uplink discount refresh time to 10 minutes
2016-07-25 17:54:58 +01:00
9f2ffa9c03
Corrects an uplink item path
2016-07-25 14:39:43 +01:00
b041a9943b
Reduces antag uplink discount refresh time to 10 minutes
2016-07-25 14:04:02 +01:00
661655f362
Removed a ".
2016-07-24 17:29:41 -07:00
af80b028e0
Added a ".
2016-07-24 17:28:30 -07:00
56a4a3dea9
fixes formatting issue
2016-07-24 17:09:38 -07:00
9147719a3a
changes to allow only horses to wear it
2016-07-24 17:03:25 -07:00
96fff1dda2
fixed some formatting errors
2016-07-24 16:30:28 -07:00
2cdec12e11
Adds horsehalf saddlebag in loadout.
...
Shouuuld let you get a bag sprited for horsetaurs in loadout
accessories.
2016-07-24 16:24:08 -07:00
fc762a6e83
Merge pull request #2189 from SinTwo/item_state
...
Icon Fix Fun Time
2016-07-24 19:21:09 -04:00
1a6504a47c
more item_state fixes: worn_state purge
2016-07-24 19:03:15 -04:00
89e98a39fb
Merge pull request #2181 from Yoshax/uplinkcosttweaks
...
Uplink cost tweaks
2016-07-24 17:13:03 -05:00
6838880374
Merge pull request #2020 from Yoshax/flashnerf
...
Makes flashes confuse and blind the person instead of stunning
2016-07-24 09:19:40 +01:00
79fda58e47
Merge pull request #2185 from SinTwo/item_state
...
Item State Cleanup Fix
2016-07-23 23:32:27 -05:00
8e9676aa26
storage item item_state fix
2016-07-24 00:19:45 -04:00
66c3a007a9
frame cleanup fixes
2016-07-23 23:45:24 -04:00
612a6f8328
Merge pull request #2149 from SinTwo/item_state
...
Item State Cleanup
2016-07-23 15:53:36 -05:00
305255d2ee
Adjusts uplink item costs
2016-07-23 21:00:53 +01:00
93b7e661c4
Ensures contraband for supply computers can be properly acquired via hacking
2016-07-23 20:24:04 +01:00
eb120319eb
Frame code cleanup
2016-07-23 13:31:30 -04:00
76dc56bd2b
Robot upgrades now checks that the upgrade type is valid.
...
As opposed to the instance itself. Fixes #13652 .
2016-07-23 16:13:29 +01:00
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
fad919c039
Adds telecrystal teleporting
2016-07-23 00:27:17 +01:00
3f0a95ae3a
Ensures there's no funny business with powering up emags
2016-07-22 23:05:54 +01:00
SinTwo