a94012b98a
Ports the rapid pipe dispenser (RPD) from /vg/
...
These are pocket devices that dispense unwrenched atmos/disposal pipes.
Despite the admittedly misleading name, these have infinite ammo.
There is no need to reload with matter cartridges or anything like that.
Currently, they spawn in atmos tech lockers, and as an engiborg module.
More can be obtained with the autolathe.
They are also a traitor "steal item" objective.
2014-12-25 22:06:39 -03:00
12ad2b796d
Merge pull request #6541 from phil235/GrenadeAssemblyConstructionFailMsgFix
...
Assembly holder no longer needs to be secured.
2014-12-25 16:16:00 -06:00
e70506580b
added message for toggling jetpack on and off
2014-12-24 16:10:44 -08:00
8ab92e753a
Assembly holder is no longer secured or unsecured. Screwdrive now disassemble it and attack_self to interact with its parts.
...
Adding feedback message when trying to attach two assemblies that aren't both in attach mode.
Fix hacky code to prime grenade by pulsing its assembly.
Removing some commented code and some duplicated proc instances.
Fixing a typo.
2014-12-24 01:50:19 +01:00
1b45752b05
Fixed conflicts
...
Ye again and again and again and again
Do it again, do it again~
2014-12-23 05:39:39 +03:00
92fc9b5d1b
And some more little fixes
...
Return of the prob to foam smashing
Correct laserpointer check
Correct wield behaviour with hulk
2014-12-23 05:22:20 +03:00
359c5896ed
Merge remote-tracking branch 'upstream/master' into meido
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-12-22 16:19:43 -03:00
126be2f312
Merge pull request #6483 from MrPerson/storage_war_hunter_kings
...
Always reset the layer of things removed from storage
2014-12-22 10:42:48 -08:00
2f3bceb79c
Merge pull request #6445 from phil235/GiveLightCig
...
Refactoring cigarette lighting and esword activation a bit.
2014-12-21 05:27:30 -08:00
57b41dce0d
Fixed some shiet
...
Redone how injectors handle mutations(now it doesnt copy the SE but
manipulates mutations directly)
Removed sole leftovers
Fixed humanizing
Fixed grammer
2014-12-21 08:19:23 +03:00
9a27fe7c8d
Conflict fix
...
Yeah makes it all work
2014-12-21 06:12:33 +03:00
2b763f18c1
Always reset the layer of things removed from storage
...
Fixes #6470
2014-12-19 09:42:06 -08:00
f1101f77a9
Adds 3 more scarves
...
These striped scarves are made by MrSnapwalk. They are included in the
ClothesMate along with the other scarves (sprited by Nienhaus). These
have a striped texture.
2014-12-19 00:24:01 -03:00
d44fa004b0
Merge branch 'master' into scarfs
...
Conflicts:
icons/obj/clothing/ties.dmi
2014-12-18 23:35:15 -03:00
eaec9a6e1b
9 more scarves and small corgi cleanup
...
Adds 9 more scarves (light blue, dark blue, orange, yellow, purple,
white, black, zebra and christmas).
Cleaned up corgi code a little bit, specially the parts involving icon
updates. Fixes a bug where adding a hat to a dead corgi didn't make you
drop your hat and created duplicate items. Makes corgis only use one
head/back mob sprite and rotate it appropriately. Call
regenerate_icons() only when needed now, instead of doing so every tick
on Life().
2014-12-18 23:09:49 -03:00
d2c85dc9c4
Merge branch 'master' into meido
...
Conflicts:
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2014-12-18 17:47:55 -03:00
ac5c322327
Merge pull request #6434 from paprka/singulobombing
...
Fixes singulo bombing
2014-12-18 10:39:57 -08:00
25188e441b
Little fix.
2014-12-18 18:00:17 +01:00
62b99c7007
Adds scarfs
...
These come in red and green, and can be equipped in the tie slot.
They are available from the ClothesMate vendomat. Sprites by Nienhaus.
2014-12-17 19:19:15 -03:00
62252f0273
Merge pull request #6420 from phil235/TypoFix2
...
Fixes a lot of "the the" in messages.
2014-12-17 16:06:35 -06:00
e132f206cf
derp.
2014-12-17 22:47:50 +01:00
bbb8eae106
Adding candle, flare and torch to is_hot() proc, fixing energy/blade returning false for it.
...
Refactoring cig lighting code a bit.
Refactoring the attack_self() procs of weapon/melee/energy and its children.
Fixed energy axe suicide code typo.
Energy axe now makes noise when toggle on/off, just like esword.
2014-12-17 22:32:40 +01:00
97794c4035
Merge pull request #6383 from kyrahabattoir/HandTeleExploit
...
Prevent using the hand teleporter from inside closets and when under the...
2014-12-17 11:06:21 -08:00
ceea358967
Merge pull request #6397 from Razharas/C4fix
...
Fix of c4 not deleting on signaler explosions
2014-12-17 11:05:42 -08:00
efc3570135
Merge pull request #6396 from phil235/WelderSpriteUpdateFix
...
Fixes the welder's onmob sprite not updating when turning off
2014-12-17 11:04:54 -08:00
63f49ab04b
Adds maid and janimaid uniforms
...
These two are available from the autodrobe.
Sprites by Nienhaus.
2014-12-17 14:03:43 -03:00
93166940f7
fixes singulo bombing
2014-12-17 02:25:33 -08:00
32f2028df1
Forgot to commit the locker changes
2014-12-16 22:38:51 -08:00
3fb065cd29
improves telebaton and police baton
2014-12-16 22:33:09 -08:00
ef189dc9d4
adds dirt overlays for walking on turfs
2014-12-16 22:12:14 -08:00
d5a7d82959
Fixes a lot of "the the" in messages.
2014-12-16 22:59:55 +01:00
fd7d6f733f
Merge pull request #6053 from phil235/LightMatchFix
...
Fixing not being able to light a cigarette in someone's mouth with a lit match
2014-12-16 12:40:49 -06:00
bb273c5034
path fixes
2014-12-15 18:40:50 -08:00
e91796d59c
proper sound changes
2014-12-15 18:36:19 -08:00
7288f865fe
undoes tortoisegit merge fuckery
2014-12-15 18:23:50 -08:00
0bb7d2a5a5
Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1
...
Conflicts:
code/game/objects/items/weapons/defib.dm
config/admins.txt
2014-12-15 18:12:14 -08:00
881fd8eaee
Merge pull request #6223 from Ergovisavi/back_slot_toggle_items_fixes
...
Fixing issues and updating equip method for Watertank Backpack / Defib
2014-12-15 16:24:58 -08:00
a1f263ec67
Merge pull request #6364 from phil235/DefibMessageColorFix
...
Changes defibrillator success/failure messages color
2014-12-15 16:18:42 -08:00
f0c8f2eeac
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
conflicts resolution
2014-12-16 02:52:08 +03:00
d5d7b7f4d7
Fix of c4 not deleting on signaler explosions
...
Fixes #6393
2014-12-16 00:47:09 +03:00
4f026fc324
Fixes the welder's onmob sprite not updating when turning off due to lack of fuel. Fixing experimental weldingtool having an invisible sprite.
2014-12-15 16:45:10 +01:00
b143e41b88
Merge pull request #6265 from Miauw62/HOHOHO
...
SANTA IS COMING TO STATION
2014-12-14 23:58:28 -06:00
fd550c82ff
Prevent using the hand teleporter from inside closets and when under the influence of a chameleon projector.
2014-12-15 00:08:03 +01:00
027ce2a1df
Changes defibrillator success/failure messages from using boldnotice span class to using notice span class for success and warning span class for failure.
2014-12-14 17:32:03 +01:00
b983176937
Merge remote-tracking branch 'upstream/master' into fashionandfashionaccesories
...
Conflicts:
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2014-12-14 11:59:45 -03:00
0b26a71a71
Merge pull request #6333 from tkdrg/singulobj
...
The singularity/narsie are no longer machines
2014-12-14 10:02:39 +03:00
21a2c2d21e
Made clumsiness into disability
...
I really dont want to make clumsy_act()
2014-12-14 08:04:48 +03:00
bafef911d4
Merge pull request #6317 from paprka/saltyfuckingcuntm8
...
Security aesthetic overhaul
2014-12-14 07:57:33 +03:00
44cc6c6d97
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-14 03:07:13 +03:00
3bd3175a18
Removed unused armbands
2014-12-13 00:14:03 -08:00
tkdrg
Cheridan
paprka
phil235
Razharas
hornygranny
MrPerson
Cuboos
KyrahAbattoir
Razharas