Commit Graph

682 Commits

Author SHA1 Message Date
AnturK b6b8a3eb09 Merge pull request #16260 from Bawhoppen/grenadesholyshithelp
Grenade belt for nukeops
2016-03-22 19:35:43 +01:00
Cheridan 7627e1c0e2 Merge pull request #15859 from Core0verload/wall_flash
Wall mounted flashes are now buildable
2016-03-21 12:32:55 -05:00
Cheridan 4227b97faa Merge pull request #15667 from kingofkosmos/storagescloseonclick
Removes backpack close-button
2016-03-21 03:10:26 -05:00
Lularian 83624574e5 tkdrg said to name commits something useful 2016-03-20 19:50:22 -05:00
Akke 18897ac972 resderved 2016-03-14 23:24:28 +00:00
c0 d206a14644 Fixes 2016-03-12 15:14:50 +03:00
c0 ed8239d840 Wall mounted flashes are now buildable 2016-03-12 15:14:48 +03:00
Joan Lung e469a4d35e Merge pull request #16018 from PKPenguin321/tactical-bola
Bolas update: Traitor items edition
2016-03-11 21:01:24 -05:00
PKPenguin321 08f78d7db9 adds reinforced bolas, tweaks uplink throwing star bundle
adds reinforced bolas, they do a Weaken(1) and take twice as long to break out of when compared to normal ones. their sprite has a different color
moves throwing star bundle to uplink_kits.dm from weaponry.dm and makes it use a syndicate box
tweaked the throwing star bundle to be the throwing weapon bundle, updated uplink listing and description accordingly
lowered throwing weapon bundle cost to 5 from 6
2016-03-09 23:02:18 -08:00
Akke d9bca07308 @steelpoint you didn't remove the bundles. 2016-03-09 23:18:53 +00:00
phil235 15d8e0a96f I refactored how a mob resisting out of a closet that is itself inside something is done.
Fixes not being able to resist out of an unlocked unwelded locker. Now both moving and the resist button  work (except for the cardboard box).
You can no longer spam breakingout message ouf of a closet by moving while inside.
Wrapping and unwrapping a locker no longer unwelds it magically.
I refactored closet/crate/item package wrapping.
You can packagewrap belts and other storage items in which the package wrap item doesn't fit.(it does currently have the unintended side effect of giving you the "doesn't fit in X" message when wrapping there storage items though).
2016-03-03 20:20:34 +01:00
tkdrg 41a42922d2 Merge pull request #15709 from Malkevin/cuffsandclean
Cuffs and sec clean up
2016-03-01 20:28:56 -03:00
bgobandit 5127ba71fc reverts name change, tweaks cost 2016-02-28 11:01:30 -05:00
kingofkosmos a3a42b8ef8 Reverts removing the backpack close-button. Modifies the close-button's sprite. 2016-02-28 17:22:22 +02:00
bgobandit 6b5379f053 Adds items to contraband crate. 2016-02-27 20:14:16 -05:00
PKPenguin321 28795e2a28 buffs emp kit
implant has 3 uses up from 2
5 EMP grenades up from 2
2016-02-24 20:38:10 -08:00
AndrewJacksonThe2nd 38f3f1dada Merge branch 'master' of https://github.com/tgstation/-tg-station into PARANOIA
Conflicts:
	code/game/objects/items.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/under/chameleon.dm
2016-02-23 21:06:36 -08:00
malkevin 8a627b9e66 Cuffs and sec clean up
Sometime last year sec officers lost one of the two pairs of cuffs they started with (I think its when the adv taser was added on spawn, cuffs used to be in the armor slot and were replaced by the taser but never placed anywhere else)
Seeing as cuffs are the only thing stopping sec officers beating the clown to death, I'm readding them.

I've also done a general clean up on sec lockers, removing the extra standard headset (why the f weren't these just replaced by the bowmans in the first place?), and stuffed the locker contents into the sec belts - because fuck the RSI inducing clickfest that is gearing up.
Reordered some of the contents of lockers, again for less repetitive clicks.

Gave the HoS a proper stun baton (I've notice most HoS's pinch a spare one from an officer's locker).
Swapped the detectives collapsible baton for a classic baton, seeing as they're as shit as collapsible batons now and fit the detective's film noir look better. Also gave him some pepperspray because its terrible enough for him to use.

:CL: Malkevin
tweak: Sec officers have two sets of cuffs again (one on spawn, one in locker)
tweak: Done some optimisation of sec spawn equipment lists and lockers to remove some of the repetitive clicking, sec belts are now preloaded with equipment.
tweak: HoS has a full baton instead of the collapsible one
tweak: Detective has a classic police baton and pepper spray instead of the collapsible baton (some made police batons shit, so don't get overly happy)
bugfix: pop scaled additional lockers spawned were the wrong type, changed them to the right type which has batons now.
/:CL:
2016-02-23 21:46:59 +00:00
phil235 91839f5f70 Action buttons will now only update when needed instead of every Life().
The action buttons now update their icon instantly.
Fixes versions of pickup(),equipped() and dropped not calling the parent.
Fixes drone not being able to remove a defib from their storage.
You can now cycle the mime mask by clicking it in your hand.
The action buttons for hardsuit and hooded suits now only appears when you're wearing the suit.
Created two mob helper procs getBeltSlot() and getBackSlot().
Created /datum/species/proc/on_species_loss() to handle stuff when our race change, currently only used by jelly and slime race to remove their exotic blood from our reagents and to remove slime people's action buttons.
2016-02-22 00:34:59 +01:00
AndrewJacksonThe2nd 5daae812f7 Chameleon PDA, fixes 2016-02-21 12:04:38 -08:00
kingofkosmos 8619c1e861 Makes storage items close when clicked on and removes the close-button. 2016-02-21 19:36:29 +02:00
AndrewJacksonThe2nd 89f07f0ab3 Chameleon Kit 2016-02-21 01:11:17 -08:00
AndrewJacksonThe2nd 5d5d2427f4 temp 2016-02-20 22:12:25 -08:00
Cheridan f0aae210c7 Merge pull request #15370 from PKPenguin321/patch-16
Separates Traitor EMP Flashlights from the EMP Kit, reduces TC prices (Remake)
2016-02-12 19:13:05 -06:00
duncathan salt c04acddef9 Merge pull request #15381 from neersighted/runtime_meet_proc
Fix a number of runtimes
2016-02-10 23:50:38 -06:00
PKPenguin321 50aa10403a removes useless returns
Made on my phone so it might fuck something up, hopefully not
2016-02-10 19:42:18 -08:00
duncathan salt ca8e3c6a0a Merge pull request #15157 from LanCartwright/nomorehardsuit
Removes hardsuit from bulldog bundle
2016-02-10 21:21:42 -06:00
Bjorn Neergaard 85e80780ce Fix storage runtime
Mobs without clients can't see into storage! They have no screen!

The following runtime has occured 92 time(s).
runtime error: Cannot read null.screen
proc name: show to (/obj/item/weapon/storage/proc/show_to)
  source file: storage.dm,104
  usr: Leo Pfeifer (/mob/living/carbon/human)
  src: the backpack (/obj/item/weapon/storage/backpack)
2016-02-10 07:20:25 -06:00
PKPenguin321 49066cdc72 removes EMPlight from EMP kit
separate commit because inbuilt editor cannot into editing two files in one PR
2016-02-09 16:50:17 -08:00
tkdrg ba2e629525 Merge pull request #15286 from AnturK/bagofboom
Adds C4 bag to uplink
2016-02-08 21:39:31 -03:00
AnturK f6f7943189 Adds C4 bag to uplink 2016-02-08 16:10:34 +01:00
tkdrg 7dc0de7a87 Merge pull request #15239 from TrustyGun/janikeys
The janitor's belt can now hold his janicart keys.
2016-02-07 21:18:21 -03:00
TrustyGun 99f2200d10 doh 2016-02-06 10:58:56 -05:00
TrustyGun 55f9adfa87 The janitor's belt can now hold his keys
This always bothered me.
2016-02-06 10:41:38 -05:00
KorPhaeron 2f6c9ec50e Bulldog Fix 2016-02-05 12:06:53 -06:00
tkdrg e8d8e6aa6c Merge pull request #15098 from KazeEspada/BLOWINGSAFE
You can now blow open secure storage containers
2016-02-03 21:58:03 -03:00
Akke 4458aa9d73 no more hardsuit no more plasma flooding 2016-02-02 23:48:21 +00:00
KazeEspada 9980018b2a Storage items now drop loot upon destruction.
Lockboxes can now be blown open.
2016-01-31 13:01:36 -07:00
tkdrg da056af83f Merge pull request #15018 from LanCartwright/fungaltbchange
removes fungal tb from traitor
2016-01-31 11:36:06 -03:00
Akke f0ef994da6 adds a nerf too
removes box
2016-01-30 19:42:13 +00:00
Firecage d2bd6871d5 Merge Conflict Fix 2016-01-20 14:07:14 +02:00
Bjorn Neergaard 1c34479376 Fix uplink code once and for all
Fixes #14733
2016-01-19 16:42:57 -06:00
Firecage d1327d4076 Merge conflict fix 2016-01-19 10:02:50 +02:00
Firecage 0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02:00
Razharas ad1c333e89 Fixes bible producing unlimited stuff
Fixes bible producing unlimited stuff
Fixes https://github.com/tgstation/-tg-station/issues/11298
2016-01-17 20:04:26 +03: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
Cheridan 6c9fa9eb72 Merge pull request #14389 from phil235/VisibleMessageRefactor
Refactor the visible_message() proc to be faster in some cases.
2016-01-09 22:16:57 -06:00
KorPhaeron a35cdae739 Fixes grenade kit as well 2016-01-08 16:03:17 -06:00
KorPhaeron b6474aa48f virus 2016-01-08 15:58:35 -06:00