Commit Graph

1178 Commits

Author SHA1 Message Date
paprka
3bf4ecfba5 fixes laziness 2014-07-18 18:30:23 -07:00
Firecage
fc4c299252 Lighting cigarettes with flares/torches
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-16 16:34:42 +02:00
Alex
72423a7bd0 Merge pull request #4059 from Miauw62/goodbyeparapen
Replaces the parapen
2014-07-14 12:47:14 +01:00
Miauw
9173a46bfd Makes C4 unable to be planted on mobs and reduces C4 cost to 1 TC 2014-07-14 13:28:42 +02:00
Rolan7
d567d23be8 Changes the layer for items on trays to -1. This makes them display on top of the tray, but not above other things. 2014-07-11 22:17:03 -04:00
Cheridan
0aae810b87 fixes merge issue with killer tomatoes
fixes soap
2014-07-07 13:59:59 -05:00
Cheridan
065028cf1d Merge branch 'master' of https://github.com/tgstation/-tg-station into ghost_notifications
i am going to murder you miauw
2014-07-07 12:51:56 -05:00
Alex
f88b6a6c4d Merge pull request #4069 from AstralSerpent/borgment_harmweldhertz
Using a welding tool on augmented limbs, cyborgs or bots will hurt while on harm intent, instead of heal.
2014-07-07 10:25:45 +01:00
AstralSerpent
10c9d4d14e Attacking augmented limbs or cyborgs with a welder on harm intent will actually harm. 2014-07-06 02:33:13 +10:00
Cheridan
52c9abbd27 Growns: The OOPening.
Refactors grown.dm to use OO programming techniques.

merge commit

conflict in map

map fix

fixing the map. again. thanks obama.

map commit

wtf

Merge branch 'master' of https://github.com/tgstation/-tg-station into ghost_notifications

map conflict fix. this should work.

updates metastation
2014-07-03 16:43:07 -05:00
Cheridan
b02b93ce2a Notifications + Random Stuff
Adds sound notifications for Ninja and Wizard Apprentice spawning -- hopefully means fewer afk antags.

Adds a ghostnotice span class, used in the new notify_ghosts proc. Upon creation, things that require ghostly attention (NarSie, golem runes) give more visible messages to the dead.

Retires the 'moderate' span class, which was only used in tomato throwing? Refactors tomato code (this ended up being the meat of this PR, somehow...)

Reorganizes some item definition/procs.
2014-07-01 23:16:02 -05:00
LandoTheClimber
c6bd1174b1 Switched it to use GetID() proc 2014-06-23 07:45:45 -04:00
LandoTheClimber
756b317e4e Allows PDA's to unlock lockboxes. 2014-06-22 16:04:59 -04:00
Cheridan
39fb126171 Merge pull request #3963 from Miauw62/itsnotmyfault
Removes custom law board confusion
2014-06-21 01:08:49 -05:00
Cheridan
06edd41bab Merge pull request #3889 from Kelenius/OfCyborgsAndModules
Of cyborgs and modules
2014-06-20 15:03:15 -05:00
Miauw
80a093643c Removes confusion because players cannot understand my genius. 2014-06-20 14:55:04 +02:00
Alex
2dc79a7bbe Merge pull request #3836 from phil235/TachyonDetectorFix
Fix Tachyon detector and TTV not being deleted if exploding inside something
2014-06-19 11:01:14 +01:00
Alex
6d80b17745 Merge pull request #3886 from Cheridan/burnitall
Burnables
2014-06-19 11:00:04 +01:00
Kelenius
a8b7588c12 Merge branch 'master' of https://github.com/tgstation/-tg-station into Temp
Conflicts:
	code/game/objects/items/weapons/grenades/ghettobomb.dm
	code/game/objects/structures/door_assembly.dm
2014-06-19 02:27:10 +04:00
phil235
caef47f075 removing the commented part 2014-06-18 20:59:03 +02:00
ikarrus
df285ff7b3 Resolved conflicts:
code/modules/mob/mob.dm
2014-06-13 09:04:30 -06:00
Alex
0aa1b9cae1 Merge pull request #3907 from Ikarrus/nosearchstrip
Non-carbon mobs can no longer search storage items
2014-06-13 09:16:59 +01:00
ikarrus
f00c623514 Reverted stripping restrictions 2014-06-12 09:29:45 -06:00
ikarrus
a8432993c0 Cyborgs can no longer strip people or search storage items
-Secborgs can still use their handcuff module to uncuff people
2014-06-11 21:50:41 -06:00
Malkevin
4cd64a51d1 Changed the weighting on blast range, 4 turns out to be quite big so shouldn't happen too often 2014-06-12 01:09:58 +01:00
Malkevin
5da7210e97 Changed the IEDs name and desc to firebombs
Changed changelog entry per request
2014-06-11 19:30:52 +01:00
Malkevin
01a7c23b94 Merge branch 'master' of https://github.com/tgstation/-tg-station into iracocktail 2014-06-11 19:06:44 +01:00
Alex
54ac7f0914 Merge pull request #3873 from Ikarrus/boxpolishjune2014
Map Update 8/6/14
2014-06-11 12:15:36 +01:00
Kelenius
3908160998 One big update for stacks. 2014-06-10 20:36:08 +04:00
Cheridan
4facf4aa47 Update cigs_lighters.dm
burnt matches get weak again
2014-06-09 21:30:57 -05:00
Cheridan
ea7ab93e21 Update boxes.dm
Removes necessary check from matchbox attackby.
2014-06-09 20:00:38 -05:00
Cheridan
b5b5735631 Refactoring of match code, makes it a little neater
Refactoring of rolling paper packs to a storage item.

Improves Rolling Paper and Packs sprites.
Cigarettes/Matches can be lit by fires now.
2014-06-09 19:56:25 -05:00
ikarrus
98abad6481 Map Update 8/6/14
-Added windows to garden and Syndicate base
-Renamed brig lockdown button to something more appropriate
-Added subtle outlines for shuttle docking areas
-Moved the HoP line flasher back to make it harder to steal the flash inside during the initial rush
-Added teleporter beacon to the old AI sat teleporter
-Moved prison newscaster
-Made N2O storage more visible for security
-Removed extraneous light in the execution room
-Added Quarantine to AI upload
-Captain now spawns with a box of spare silver IDs instead of regular ones
-A few minor piping/wiring improvements
2014-06-08 19:26:37 -06:00
Malkevin
b4ee133336 spaces 2014-06-08 01:00:51 +01:00
Malkevin
67fdbfbaaf Funfact: pickweight doesn't like numbers unless they're in a string. 2014-06-07 21:42:27 +01:00
Malkevin
6aa15e7337 Changed IEDs into firebombs.
Changed IEDs into firebombs to curtail the amount of station damage done whilst keeping IEDs useful and still keeping fuel tank bombs a useful saboteur's tool.

Their fuse time is a bit more variable too, including a 1 in 10 chance of them going off practically straight away (note: this is counter-able by the user wearing a fire-suit, git gud and l2p)
2014-06-07 03:18:21 +01:00
Rockdtben
569d12facf Moved item_heal_robotic out of obj/item and into mob_helpers.dm 2014-06-05 19:25:08 -05:00
Alex
d0db8fdbed Merge pull request #3832 from phil235/StunprodFix
Stunprod Fix
2014-06-05 21:40:45 +01:00
ikarrus
40800b79e0 The Loggening: Admin Edition
-Build mode logging. A lot of its functions are highly abusable but not logged
-Gravity Catapults no longer spam asay. They will be kept in the game log.
-Logging for Cyborg handcuffs
-Logging for Stripping/equipping
-Logging for decreasing PA power control. Easier as an admin to tell when I should panic without having to watch them like a hawk.
-Logging for disposaling people
-Some code optimizations along the way as well
2014-06-02 23:13:33 -06:00
phil235
dca72dc916 Fix Tachyon detector and TTV not being deleted if inside something 2014-06-02 20:25:06 +02:00
phil235
40fbe585ba Warning message replaced by sparks sound 2014-06-02 01:42:50 +02:00
phil235
2be11ab55e Fix 2014-06-02 01:01:16 +02:00
phil235
8c6cd7b28f Stunprod Fix
* Fix icon not updating when turning off baton/stunprod with a total cell charge below the hitcost.
* Baton/stunprod no longer accepts cell with capacity below the hitcost(charge used per stun).
* Removes being able to give one last hit (that doesn't even deduct any charge) when the cell charge gets below the hitcost.
* Adds warning message when baton/stunprod turns off from being out of charge.
2014-06-02 00:42:23 +02:00
Miauw62
44f769208c Merge pull request #3804 from Cheridan/roboShlock
Fixes Robocop board not working
2014-06-01 12:16:16 +02:00
Miauw62
cc7760c628 Merge pull request #3750 from hornygranny/tablethisfornow
fixes #3746 fixes #3706
2014-05-28 18:58:11 +02:00
Cheridan
5aa17924b3 Fixes Robocop board not working 2014-05-27 15:59:10 -05:00
Hornygranny
af2e792036 2oop4u 2014-05-27 12:07:53 -07:00
Hornygranny
6b7d3f49a9 muh OOP 2014-05-27 10:40:15 -07:00
Miauw62
21fdd8d7e4 Merge pull request #3723 from Ikarrus/monkeyimplants
Monkeys can be loyalty implanted
2014-05-24 19:51:46 +02:00
Cheridan
6bf97eb280 Merge pull request #3774 from Rolan7/Issue_1063
Fixes dodgeballs
2014-05-22 16:00:55 -05:00