f48a22a6c8
-changes the deductcharge proc again to get rid of my silly hack.
2013-04-22 15:32:00 -05:00
d82bb638e4
-Fixes me not using the appropriate setter procs for cell charge.
2013-04-22 14:32:46 -05:00
f14f733a41
New suicide_act for C4 which blows up the user and makes them say a catchy phrase depending on their role.
2013-04-22 19:37:11 +01:00
d7406925a8
-Actually fixes the issues with inhands not updating. Thanks to Aranclanos.
2013-04-22 01:03:42 -05:00
189611e6d6
-Fixes the stuff Giacom pointed out.
...
-Updated some other items to use the hitsound var while I was at it.
2013-04-21 23:26:59 -05:00
1317ea6462
Merge branch 'master' of https://github.com/tgstation/-tg-station
2013-04-21 18:58:26 -05:00
0fe1b6c1b6
Merge pull request #403 from Petethegoat/issuefixes
...
Issue fixes
2013-04-20 06:16:38 -07:00
75f7a529d1
Removes /obj/item/weapon/wire (it did nothing, it's not cables)
2013-04-18 19:57:24 +01:00
05897ca80f
Standardised welders in tools.dm. Includes text styling and names. Removes redundant procs and code. Adds mob icon updates where appropriate.
...
Also includes a change to cable cuff removal so that the cablecuff itself is garbage collected.
2013-04-17 23:52:15 +01:00
8f02d5fee1
Commitin' the stuff that didn't merge
2013-04-16 23:13:35 -05:00
6731fe8b83
Merge branch 'master' of https://github.com/tgstation/-tg-station
...
Conflicts:
code/game/objects/items/weapons/handcuffs.dm
code/game/objects/structures/crates_lockers/closets/secure/security.dm
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2013-04-16 23:07:35 -05:00
c429e5883e
MAKESHIFT WEAPONS UPDATE
...
-Removes stungloves and all related code.
-Makeshift stun batons can be made in their stead, along with spears. Spears can be thrown or used one or two-handed.
-Major stun baton revamp. They now accept batteries, which can be removed and replaced.
-Fixes the bug where you could use TK to make a dualsaber from a single saber.
2013-04-16 22:59:01 -05:00
657ac139d2
Merge pull request #351 from Petethegoat/cuffsound
...
Cuffs now play the sound when they're first used, not when they're finished
2013-04-16 15:36:17 -07:00
e4bce0bb14
Replaced most reagent initialisations with the helper proc create_reagents().
2013-04-15 15:40:33 +01:00
d4cdaa2f00
Merge branch 'master' of github.com:tgstation/-tg-station
2013-04-14 19:03:37 +01:00
6f43f81c05
Updating razors to reduce code duplication. Adjusts text styling.
2013-04-14 19:02:52 +01:00
abb0f77c5d
Merge pull request #353 from Nodrak/freeformlogfix
...
Fixes freeform module logging
2013-04-13 07:09:29 -07:00
d7d7c070de
Fixes freeform module logging from logging the player who input the law as both the uploader and the uploadee.
2013-04-13 10:06:28 -04:00
6c34a59aca
Cuffs now play the sound when they're first used, not when they're finished.
2013-04-13 01:14:10 +01:00
c7d99edf60
-Moved headgear and mask check up and used get_location_accessible()
...
-Updated skinhead sprite to be more transparent
-Updated razor sprites
-Updated Changelog
2013-04-10 21:00:15 -06:00
5a49fc33b3
Merge branch 'master' of https://github.com/tgstation/-tg-station into razors
2013-04-10 20:07:40 -06:00
c19e7044d4
-Added electric razors to the prison wing, captain's office, and locker room
...
-Updated changelog
2013-04-09 22:45:46 -06:00
782403ddbd
Pepper Spray Update!!
...
-Capsaicin can be turned into Condensed Capsaicin via chemistry.
-Alters the effect of pepper spray slightly. Changes it from a paralyze(KO) to weaken(stun like batons, etc), and adds slight lingering confuse effect.
-Adds teargas grenades(pepper spray smoke chem grenades), currently obtainable in Weapons crates and Riot crates.
Supplypacks:
-Adds a roll of film to the bureaucracy crate, and made it a little cheaper.
-Removes the beanbag crate entirely, it redundant. Just print out the beanbag shells at the autolathe.
-The previously-overpacked Riot gear crate comes with 1 less set of equipment, but with more handcuffs. Made cheaper to compensate.
2013-04-09 14:58:41 -05:00
12bd728f19
* Added a manual for Virology. It spawns in Virology and it links to the "Infections" wiki page.
...
* New icon for the manual.
2013-04-06 16:46:05 +01:00
861084061e
Merge pull request #167 from Petethegoat/implantdiskfix
...
Cavity implant disk fix, steal objective finding fixes
2013-04-01 10:32:17 -07:00
d1db9d4abf
Merge pull request #177 from Petethegoat/janicart
...
Replaces the janicart with the janitorial cart.
2013-04-01 10:21:46 -07:00
a8717b4f62
Merge pull request #190 from Carn/Issue118
...
Resolves issue #118 - Mob overlays will now update when a cigarette expl...
2013-04-01 10:04:17 -07:00
91c15c13dc
Merge pull request #173 from Petethegoat/runtime_fixes
...
Runtime fixes
2013-04-01 09:56:25 -07:00
4a858b08f4
Resolves issue #118 - Mob overlays will now update when a cigarette explodes from plasma/weldingfuel after being lit.
2013-04-01 06:41:18 +01:00
881e933072
Merge pull request #182 from Petethegoat/names
...
Fixes PDA and bag names.
2013-03-31 18:50:26 -07:00
7f70e4ec35
Merge pull request #159 from Aranclanos/Fourth
...
Added adminlogs to hacked laws (tator syndicate board)
2013-03-31 06:41:40 -07:00
c31eb95912
Fixes PDA and bag names.
2013-03-31 14:34:51 +01:00
b06283caa0
Fixes bags.dm. :/
2013-03-30 18:32:44 +00:00
66b2caeeb8
Updating to fit with Cheri's sprite pull.
...
Fixes not being able to store the mop when the cart and mop are dry.
2013-03-30 17:50:25 +00:00
f1d5f175c5
Fixes capitalisation of the cleaner grenade.
2013-03-30 04:18:25 +00:00
9425c0186c
Updates the mop and mop bucket code. Should work exactly the same.
2013-03-30 04:17:55 +00:00
dcebf2cd4a
Readded the thwump sound when you harmbaton a dude.
2013-03-29 17:18:38 +00:00
1b6683b443
Update to use proper procs rather than setting stuttering directly
2013-03-29 17:10:42 +00:00
d6bec54dcc
Fixed the forcesay runtimes, and slightly restructured stunbaton.dm.
2013-03-28 18:18:06 +00:00
3496310ec3
Removes /obj/item/weapon/gift from the code, as it was completely unused.
...
Also removes the smallDelivery loop in /mob/proc/get_contents(). It's amazing that proc worked at all, it really does do what it's described as doing. I'm leaving it for now, as the game seems to have gotten on well enough so far, and it'll probably just increase processing for no gain if I fix it.
2013-03-28 13:02:46 +00:00
00da961d14
Added adminlogs to hacked laws (tator syndicate board)
2013-03-27 21:49:32 -03:00
d53fdcaede
Set the twohanded.dm offhand item to abstract = 1.
2013-03-25 17:15:14 +00:00
986b06bb10
Merge pull request #59 from Nodrak/master
...
Airlock Painters
2013-03-19 21:37:33 -07:00
c983e287a3
Modifications/RuntimeFixes for Majorseph's cigarette lighting stuff:
...
>type mismatches in cigarette/attack()
>mob overlays now update correctly when lighting somebody else's cigarette/cigar/pipe/etc
>removed some copypasta procs (pipe/light(), pipe/attackby() and cigar/attackby())
Signed-off-by: carnie <elly1989@rocketmail.com >
2013-03-18 00:13:44 +00:00
8b906530fe
Changed the airlock_painter stuff back to how Ricotez had them coded. Instead of clicking on the painter and setting the airlock type that way, you do it when you click on the door with the painter.
...
Cheridan fixed the inhand sprites being off, thanks Cheridan!
2013-03-16 13:05:50 -04:00
d3f7959350
Changelog updated. Added the ability to help people light cigs with cigs/cigars.
...
Signed-off-by: majorsephiroth <majorsephiroth@hotmail.com >
2013-03-14 10:44:22 +11:00
33905ce24a
Expanded what can light things. Cigars and pipes can now be lit by standard sources. Standard sources are: Lighter, Zippo, Igniter, weldingtool, energy sword, and candles.
2013-03-13 16:17:02 +11:00
7c01c25232
Merge branch 'master' of git://github.com/Cheridan/-tg-station
2013-03-11 17:51:19 +00:00
971cf6e628
Cable coils and cable cuffs now use the inhand sprites. Only red and blue, for now.
2013-03-11 11:53:27 -05:00
14b1777359
Rewrote how handcuffs work. Fixes gcode issue 1376.
...
Includes standardization and text styling.
2013-03-11 15:54:00 +00:00
Cheridan
Giacomand
Pete Goodfellow
Pete Goodfellow
Nodrak
Ikarrus
Cael Aislinn
carnie
Aranclanos
majorsephiroth