Alex
99fae13391
Merge pull request #4393 from paprka/emptyclick
...
Empty gun click noise
2014-08-19 10:36:06 +01:00
MrPerson
09071b88d5
Merge pull request #4357 from paprka/nerfninja
...
Makes ninja less stupidly broken (balancing)
2014-08-16 04:13:49 -07:00
Alex
74c22755be
Merge pull request #4365 from paprka/fingerlessgloves
...
Adds fingerless gloves, other glove related changes
2014-08-15 08:03:37 +01:00
paprka
bbf90b10d3
span fixes
2014-08-12 02:15:07 -07:00
Alex
ff25503b4d
Merge pull request #4384 from Ikarrus/deputybands
...
[MAP] Boxstation Update and Deputy Armbands
2014-08-12 08:12:15 +01:00
paprka
e97f21a24a
empty weapon click
2014-08-11 22:56:05 -07:00
Alex
9cfb19f511
Merge pull request #4373 from paprka/deepgunlore
...
Whole bunch of gun-related stuff
2014-08-11 16:25:05 +01:00
Alex
53d9aca271
Merge pull request #4371 from paprka/bowmanheadsets
...
Bowman radio headsets
2014-08-11 14:13:26 +01:00
paprka
e3c26bfdd1
Merge remote-tracking branch 'remotes/upstream/master' into deepgunlore
...
Conflicts:
code/game/objects/items/weapons/storage/uplink_kits.dm
2014-08-09 16:19:33 -07:00
ikarrus
8a5d1325d1
Update boxes.dm
2014-08-09 14:23:37 -06:00
ikarrus
22e0081cf3
Resolved Conflicts:
...
code/game/objects/items/weapons/storage/boxes.dm
2014-08-09 14:19:43 -06:00
ikarrus
3c96428603
[MAP] Boxstation Update and Deputy Armbands
...
-Singularity engine is now sealed off from outer space, making it more secure from saboteurs and safe from meteors
-Deputy armbands (red) added to HoS office. These can be ad-hoc distributed by the HoS when deputizing crew
-Slight remap of HoS office to fit everything in there. added a filing cabinet and paper, too
-Shutters added under robotics and R&D's primary hallway windows
-Filing cabinet and paper added in bridge
2014-08-09 14:11:04 -06:00
paprka
726b939754
whole bunch of gun stuff
2014-08-07 14:39:31 -07:00
Firecage
24b18fad93
Absolute paths for item files.
2014-08-07 23:02:43 +02:00
paprka
e901f9b6c1
bowmans
2014-08-07 12:30:14 -07:00
paprka
3b00fa9cfa
cargonia strong!
2014-08-07 05:51:27 -07:00
paprka
c09d8981fe
makes ninja less stupidly broken
2014-08-06 15:13:06 -07:00
MrPerson
5b0aba0e67
Merge pull request #4262 from kyrahabattoir/ItemNameFixing07-2014
...
Another lowercasing pass on a bunch of items and furnitures.
2014-08-02 18:02:50 -07:00
Cheridan
c74601646a
Merge pull request #4287 from AndroidSFV/taperecorderfix
...
Fixes a minor span class in tape recorder
2014-07-31 22:28:27 -05:00
KyrahAbattoir
1b2c95a81c
Merge branch 'master' into ItemNameFixing07-2014
2014-07-31 18:54:38 +02:00
Alex
589d38660a
Merge pull request #3967 from CollenN/radscanner
...
Adds Radioactive Microlaser to Traitor Arsenal
2014-07-30 10:13:10 +01:00
AndroidSFV
99e7957db0
Fixes a minor span class in tape recorder
2014-07-29 14:59:51 -05:00
KyrahAbattoir
fcb2fb9de3
Another lowercasing pass on a bunch of items and furnitures.
...
Synthflesh should be a plural.
Leg cuffs is better than legcuffs.
LaserTag -> laser tag is not a brand name.
centcom -> Centcom is always capitalised.
2014-07-27 19:14:40 +02:00
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
cf7c466779
Merge pull request #4144 from Rockdtben/securityPDA
...
PDA - Security Records were missing tables.
2014-07-14 14:17:11 +01: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
Alex
eddcde41a8
Merge pull request #4135 from Rolan7/Issue_1919
...
Fixes tray layer issue
2014-07-14 09:26:05 +01:00
Rockdtben
0e26850893
PDA - Security Records were missing tables.
...
Fixed a bug where printing would stop working if a record was deleted.
2014-07-12 20:54:47 -05: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
paprka
7a853c5f86
round 2
2014-07-10 20:24:49 -07:00
paprka
b92397a2e3
paprikkas gay
2014-07-10 20:12:24 -07: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
CollenN
7b90557dea
..()
2014-07-07 13:46:59 -04: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
Ben G.
d497387355
Merge pull request #4048 from Kelenius/OfAIAndHUD
...
Gives the AI a simple hud
2014-07-06 12:58:13 -05:00
Kelenius
e9d2124220
usr -> user
2014-07-06 21:33:05 +04:00
CollenN
92cd196731
Stuff 2
2014-07-06 08:54:07 -04:00
CollenN
ae0be09cba
Stuff
...
Stuff: The Commit: The Update
2014-07-05 22:53:19 -04: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
Kelenius
d8ae776f64
Gives the AI a hud
2014-07-03 18:52:11 +04: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
CollenN
734558f7cc
Removes reagent check
...
I've been somewhat busy recently.
2014-06-30 17:01:29 -04:00
Cheridan
854d6452f6
Merge pull request #3978 from LandoTheClimber/lockboxpda
...
Allows PDA's to unlock lockboxes.
2014-06-25 11:56:00 -05:00
LandoTheClimber
c6bd1174b1
Switched it to use GetID() proc
2014-06-23 07:45:45 -04:00
MrPerson
1494b8062f
Makes the spare PDA box on the bridge not invisible
2014-06-22 16:21:42 -07:00
LandoTheClimber
756b317e4e
Allows PDA's to unlock lockboxes.
2014-06-22 16:04:59 -04:00
