7ee2317ec3
Merge pull request #6207 from phil235/RecursiveHearVisibleMessage
...
Mob inside something can now see visible_message()'s
2014-12-27 13:20:50 +01:00
0b4261e016
Merge pull request #6355 from AnturK/librarian_pda
...
Adds Librarian PDA cartridge
2014-12-27 01:44:49 -03:00
1f288f56ae
Merge pull request #6290 from Xhuis/porta_console
...
Handheld crew monitor
2014-12-27 01:43:42 +00:00
84649dacd4
Merge pull request #6339 from tkdrg/rip'd
...
Ports the rapid pipe dispenser (RPD) from /vg/
2014-12-26 23:58:17 +00:00
fe139e437d
RPD tweaks
...
Turns the pipe modes into defines and adds some span classes
2014-12-26 20:50:34 -03:00
09b4b7a3cc
Merge pull request #6554 from paprka/jetpackssuck
...
Makes jetpacks more obvious when they're on
2014-12-25 21:25:56 -08:00
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
5d2994eb35
Merge pull request #6526 from paprka/secondchef
...
Adds second chef position / Renames chef to cook
2014-12-25 15:30:00 -06:00
591b2f363b
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-12-25 13:12:46 -08:00
595ad8df58
fixed compile errors
2014-12-24 21:03:22 -08: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
2371e2ebd8
renames chef to cook
2014-12-22 17:02:06 -08: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
108a8cc155
Merge pull request #6473 from Delimusca/grenadeinhands
...
Fixes grenades looking like flashes.
2014-12-22 11:10:05 -08: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
c002d11ee7
Merge pull request #6476 from Cheridan/nightcrawler
...
Refactors snowflake AI hosting in ninja
2014-12-21 17:02: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
5a48f313cb
Merge pull request #6399 from paprka/radioshit
...
Removes useless standard encryption keys from headsets
2014-12-21 05:08:10 +00:00
80a4bc285d
Adds empgrenade inhand, removes missed comment
2014-12-19 18:11:27 -07:00
2b763f18c1
Always reset the layer of things removed from storage
...
Fixes #6470
2014-12-19 09:42:06 -08:00
c667feeb61
Merge branch 'master' of https://github.com/tgstation/-tg-station into RecursiveHearVisibleMessage
...
Conflicts:
code/modules/reagents/Chemistry-Holder.dm
2014-12-19 15:23:16 +01: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
25cc2999b0
Refactors snowflake AI hosting in ninja
...
why did i volunteer for this
It just has an integrated intellicard now. The gloves do the transferring.
Also Intellicards are all called Intellicards now and not Intelicards.
the ai_transfer proc is less awful but it's still
awful
awful awful awful
2014-12-18 21:03:09 -06: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
332cc37b13
Added grenade inhands.
2014-12-18 17:58:43 -07:00
4bdf83c59f
Revert "adds grenade inhands."
...
This reverts commit d1295616c8
2014-12-18 17:27:01 -07:00
d1295616c8
adds grenade inhands.
2014-12-18 16:57:47 -07: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
e573f02acc
Check trimming
2014-12-17 14:36:49 +01:00
93166940f7
fixes singulo bombing
2014-12-17 02:25:33 -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
9b050ff010
removes meta protection from binary translator key
2014-12-16 00:37:54 -08: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
Swag McYolosteinen
tkdrg
Remie Richards
hornygranny
Cheridan
paprka
phil235
MrPerson
Delimusca
Cheridan
AnturK
Cuboos