tkdrg
5e00afd4cc
Merge pull request #14914 from PKPenguin321/is-that-a-knife-in-your-shoe-or-are-you-just-happy-to-OOF
...
Adds the ability to store knives/pens/edaggers in certain shoes
2016-01-31 22:00:43 -03:00
PKPenguin321
cdfefbf92b
fixes travis
...
o n e l i n e c o m m i t s
2016-01-31 16:26:21 -08:00
tkdrg
faa81107d6
Merge pull request #15079 from KorPhaeron/ctf_bugfix
...
CTF bugfixes and control point
2016-01-31 21:23:52 -03:00
PKPenguin321
eeda4bbd04
updates var names, allows clown shoes to hold bike horns
...
zilenans around the globe, rejoice
2016-01-31 15:54:32 -08:00
PKPenguin321
616b24dda9
changes istype to is_type_in_list, adds a w_class check
...
also changes some var names to be less knife-specific and more item-specific
2016-01-31 15:52:11 -08:00
tkdrg
2f9cf25120
Merge pull request #15000 from KorPhaeron/hat_buffs
...
Buffs cakehat
2016-01-31 13:45:55 -03:00
tkdrg
6b3e02e9be
Merge pull request #15056 from bgobandit/mimefeels
...
Mimes can now alter their mask to display different emotions.
2016-01-31 11:51:40 -03:00
KorPhaeron
5c8b8b8148
Red shields for red hardsuits
2016-01-31 04:32:40 -06:00
bgobandit
40a2d8e6d1
no spaces, cycle proc, honk honk honk
2016-01-30 19:47:31 -05:00
bgobandit
11043a07f6
Adds scared mime mask and adjusts sad mime mask :(
2016-01-30 18:59:25 -05:00
bgobandit
170a87e69b
Alt-click and action button
2016-01-30 16:32:30 -05:00
tkdrg
0ff42cb218
Merge pull request #14962 from Boredone/ReRadioactiveArmor
...
Radioactive Teleport Armor
2016-01-30 00:27:13 -03:00
bgobandit
859058f053
Mimes can now alter their mask to display different emotions.
2016-01-29 21:10:31 -05:00
PKPenguin321
fbac29339e
calls my parents
...
they were getting lonely
ps i actually have no idea what this does it might break things
2016-01-29 16:43:20 -08:00
PKPenguin321
20e70de015
removes quality humor
...
comments are srs bisnis
2016-01-29 16:32:04 -08:00
Razharas
b1c3088ddb
Merge pull request #14608 from ChangelingRain/tacticruel
...
Tacticool jumpsuits aren't cool for protection
2016-01-29 21:30:28 +03:00
Razharas
0826128459
Merge pull request #14698 from Firecage/absolutepathsandifs
...
Absolute paths and changes one liner if's/else's/else if's.
2016-01-29 03:15:12 +03:00
Boredone
f83bb4ca3c
Removed the extra Var definition of reaction chance on the reactive/teleport armor, and changed the description on the base one.
2016-01-28 14:31:13 -07:00
KorPhaeron
e3021745a1
Buffs cakehat
2016-01-28 00:51:10 -06:00
Boredone
91e4b8f93b
Forgot the H. on the Rad_Act, so it didn't actually do anything. Fixed.
2016-01-27 20:44:59 -07:00
Boredone
c66ea73868
This removes the teleportation from the base reactive armor, while making the amount of radiation, and how far it can possibly teleport, based on some vars.
2016-01-27 16:46:36 -07:00
PKPenguin321
952e475808
addresses some feedback, hoopefully makes it compile
...
only part i'm not 100% sure about is the iscarbon, but whatever
2016-01-27 10:01:49 -08:00
Firecage
7f96592b87
Merge Conflict Fix
2016-01-27 13:29:38 +02:00
Boredone
4eb671093d
Messed up a bit on the first commit, doing this removed some compile errors.
2016-01-27 02:09:03 -07:00
Boredone
c5266a014c
Ah, first commit. This makes a new child or Reactive Armor, reactive/teleport.
...
It is the same as normal reactive teleport armor, but radiates the one wearing it I'm pretty sure.
2016-01-27 01:44:36 -07:00
PKPenguin321
74f20f3fed
allows switchblades too
...
still no bike horns, rip zilenan
2016-01-26 17:28:03 -08:00
PKPenguin321
a356825b42
fixes a case where held_knife wouldn't null after knife was removed
...
O N E L I N E C O M M I T S
N
E
L
I
N
E
C
O
M
M
I
T
S
2016-01-26 10:23:41 -08:00
PKPenguin321
7327029627
addresses some various feedback
...
changes position of a message, tweaks a message, removes useless fingerprint line
2016-01-26 10:18:29 -08:00
PKPenguin321
cde623c4bf
fixes up some helmets
...
i honestly do not know what i am doing any more i am just parroting what @neersighted said to do
fixes https://github.com/tgstation/-tg-station/issues/14904 maybe
2016-01-25 21:06:04 -08:00
PKPenguin321
1f0f3fb6e7
makes drawing the knife use alt click instead of click drag
...
so many saved lines
oh yeahhh feels good
thanks @neersighted
2016-01-25 20:52:19 -08:00
PKPenguin321
9224027ca8
adds the ability to store knives/pens/edaggers in certain shoes
...
added by clicking the shoe with said items, and removed by click-dragging the shoe with the item to yourself/an empty hand slot
2016-01-25 18:31:58 -08:00
duncathan salt
2f526076c3
Merge pull request #14818 from KorPhaeron/halt_halt_halt
...
Fixes deaf people hearing sec hailers
2016-01-24 13:07:56 -06:00
tkdrg
056e5636b2
Merge pull request #14792 from KorPhaeron/helmet
...
Fixes hardsuit helmet noise spam
2016-01-24 09:08:43 -03:00
KorPhaeron
2cb4b85b4a
Fixes hailer
2016-01-23 12:34:01 -06:00
KorPhaeron
b8bd84b62b
Helmet
2016-01-22 17:52:26 -06:00
Firecage
d2bd6871d5
Merge Conflict Fix
2016-01-20 14:07:14 +02:00
duncathan salt
f9e35f1695
Merge pull request #14706 from xxalpha/straightouttajacket
...
Fixes the straightjacket
2016-01-19 07:24:51 -06:00
Firecage
d1327d4076
Merge conflict fix
2016-01-19 10:02:50 +02:00
Bjorn Neergaard
a1ff8e8783
Refactor tgui interactions
...
Removes a lot of duplicated code, thanks to @nullquery's parent tweaks
2016-01-18 14:27:56 -06:00
xxalpha
53b74da4bd
Fixes the straightjacket
...
More straightfixes
2016-01-17 22:12:34 +00:00
Firecage
0cb6814c18
Merge conflict fix
2016-01-17 19:15:30 +02:00
Firecage
332bde0f4f
Does the rest of the if()'s/ else's
2016-01-17 19:03:12 +02:00
Firecage
754491ce4c
Changes relatives paths into absolute paths and makes some if()'s better
2016-01-17 01:36:56 +02:00
Nerd Lord
eae13b9e06
Reactive tesla armor uses the tesla lightning bolts instead of revenant lightning
2016-01-12 22:54:50 -05:00
Nerd Lord
20c6887b57
Tacticool jumpsuits aren't cool for protection
2016-01-12 22:45:38 -05:00
KorPhaeron
16bf636167
Helmets
2016-01-08 08:15:46 -06:00
Michael Gartley
3cf26018de
Small grammar fix to shielded message.
...
Fixes #14297
Added span class and reworded message while trying to keep the flavour
of text.
NB: This time I hopefully wont be such a pleb when trying to help.
2016-01-04 04:14:20 +00:00
tkdrg
e681243c44
Merge pull request #14151 from SouDescolado/patch-1
...
Add telescopic baton item to detective trenchcoat
2015-12-30 18:12:09 -03:00
tkdrg
f04936251a
Merge pull request #14149 from SouDescolado/patch-2
...
Add telescopic baton item to detective armor
2015-12-30 18:10:20 -03:00
SouDescolado
548549409b
Update jobs.dm
...
/obj/item/weapon/melee/classic_baton/telescopic instead of /obj/item/weapon/classic_baton/telescopic
2015-12-29 17:27:17 -02:00