Commit Graph

5859 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
Neerti
e455583a49 Merge pull request #2350 from Anewbe/cappy_closet
Tweaks the contents of the captain's closet
2016-08-24 23:27:37 -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
Anewbe
4aaa45736d Tweaks the contents of the captain's closet 2016-08-21 21:22:09 -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
0b96487e0d Fixes #2012 2016-08-15 10:46:26 -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
EmperorJon
f6a7d068d5 Merge pull request #2314 from Anewbe/taj_cleanup
Taj cleanup
2016-08-15 11:32:05 +01:00
EmperorJon
2810683110 Merge pull request #2319 from ColaFiend/master
Minor text fixes.
2016-08-15 10:04:08 +01:00
Brightdawn~
b5eec907c0 Minor text fixes.
Changes description of rainbow shoes.

Adds description for:
Potted Plant
Plating
2016-08-15 06:31: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
Hubblenaut
2c92802db5 Adds a verb for toggling specific pieces of underwear 2016-08-12 20:58:40 +02: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
Neerti
7907de5974 Merge pull request #2173 from Yoshax/telecrystalfun
Adds telecrystal teleporting
2016-08-06 20:23:50 -04:00
Yoshax
623cb52e84 Grammar typo fix 2016-08-07 00:51:33 +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
Hubblenaut
044a677ab0 Construction Tweaks and Fixes (#2253)
* Fixes reinforced Walls construction

when having one sheet left in the stack

* Amends Windoors

 - Assemblies are now made with two sheets of either normal or reinforced
   glass sheets, for normal and secure windoors respecting.
 - Assemblies can now be named with a pen, just like airlocks.
 - Windoor assemblies now get placed like windows, and windows take
   windoor assemblies into account when placed.
 - Decapitalises windoor assembly names.
 - Shattering windoors will make them drop exactly what they were made of
   now.
 - Prying emagged windoors will no longer make them shatter on top of
   returning to an assembly.
 - Cleans up a lot of code and gets its own update_icon() proc.

* Amends airlocks

 - Fixes airlocks occasionally not updating their icon correctly.
 - Fixes airlocks causing sparks on spawn as if they were damaged.
 - Fixes airlock not being anchored after being turned into an assembly.
 - Decapitalises airlock names.

* Windows that get unanchored by force will now correctly have the rotate verb.

* Adds changelog entry
2016-08-02 18:39:22 +01:00
Anewbe
6423aa6330 Should remove flickering heat warning for FBPs and suit coolers 2016-08-01 22:06:26 -05:00
Anewbe
6b0704f10f Adds pepperspray and a crowbar to the HoS locker 2016-07-31 23:05:38 -05:00
Anewbe
3795e5c52a Suit coolers now work while worn on the back 2016-07-31 00:15:42 -05: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
Anewbe
66f373d313 Merge pull request #2208 from SinTwo/itme_state_cleanup
Icon Name Fixes
2016-07-25 22:11:20 -05:00
SinTwo
8eae6a7dee (hopefully) last name tweak 2016-07-25 19:50:19 -04:00
Yoshax
7fbb123a4d Improves/fixes surplus crate item selection 2016-07-25 23:13:12 +01:00
Yoshax
f19c922984 Improves surplus crates 2016-07-25 21:45:54 +01:00
EmperorJon
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
Yoshax
9f2ffa9c03 Corrects an uplink item path 2016-07-25 14:39:43 +01:00
Yoshax
b041a9943b Reduces antag uplink discount refresh time to 10 minutes 2016-07-25 14:04:02 +01:00
Yoshax
6945aff868 Merge pull request #2187 from Anewbe/sec_coat_pockets
Adds pockets to the HoS and Warden coats
2016-07-25 01:41:45 +01: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