1f288f56ae
Merge pull request #6290 from Xhuis/porta_console
...
Handheld crew monitor
2014-12-27 01:43:42 +00:00
3ca6d769a1
adds catwalks
2014-12-26 17:38:55 -08:00
f0cc5cce4d
Merge pull request #6330 from RemieRichards/MapperFriendlySoundTrigger
...
Simple sound effect map object
2014-12-26 22:36:55 -03: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
5c8a8b5dca
Merge branch 'master' of https://github.com/tgstation/-tg-station into highspeednodrag1v1mem80quickscopenotaser
...
Conflicts:
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
2014-12-26 09:09:24 -08:00
b6e35278e3
Fixes cutting black gloves to make fingerless gloves not changing the icon to fingerless.
...
Fixes the washing machine being able to change boxing gloves, ninja gloves and botany gloves to look like simple colored gloves. Creating a /gloves/color category for all gloves whose color can be changed.
Fixing some absolute pathing.
2014-12-26 17:04:09 +01:00
7eb69190e7
Merge pull request #6356 from paprka/burtsfiya
...
Burst fire for some projectile weapons
2014-12-26 08:38:21 +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
5e02790327
fixes capgun ammo sprites
2014-12-25 18:15:45 -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
21df99154d
Merge branch 'master' of https://github.com/tgstation/-tg-station into burtsfiya
...
Conflicts:
code/modules/projectiles/gun.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/modules/projectiles/guns/projectile/shotgun.dm
icons/obj/gun.dmi
2014-12-25 13:51:43 -08: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
404da4dbdd
code optimizations
2014-12-25 13:28:05 -08: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
a6acdeb3c2
initial commit
2014-12-25 13:07:06 -08:00
96237278fa
Merge branch 'master' into meido
...
Conflicts:
code/modules/clothing/under/miscellaneous.dm
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2014-12-25 12:41:29 -03:00
595ad8df58
fixed compile errors
2014-12-24 21:03:22 -08:00
7842ff8803
adds advanced tasers as default
2014-12-24 19:41:40 -08:00
1d1baa96bc
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-24 18:56:26 -08:00
e70506580b
added message for toggling jetpack on and off
2014-12-24 16:10:44 -08:00
4374e46cdd
Fixes being able to smash grille/newscaster/mirror/lights with holo esword.
2014-12-24 23:50:20 +01:00
558f263732
Removed the ability of windows to be unanchored and ejected when low on health.
2014-12-24 20:45:47 +01:00
bec442796c
Fixed being able to spam slam someone onto a toilet during a swirlie.
...
Added sound when slamming someone onto the toilet and when slamming the toilet lid onto someone's head.
Nerfed the damage for these two actions a bit.
Fixes the victim's message for these actions not being bold red.
2014-12-24 17:10:27 +01: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
774f5f502f
Fixes some grammar for the dresser.
2014-12-22 20:00:31 -06:00
127aabbfa9
Adds socks as an underwear option.
2014-12-22 19:27:46 -06:00
2371e2ebd8
renames chef to cook
2014-12-22 17:02:06 -08:00
70edf69f25
Fixes table having two mousedrop_T() procs.
...
Adding a rack_destroy() proc.
Fixes table blob_act and ex_act a bit.
2014-12-23 00:22:57 +01: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
47659dbbf4
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2014-12-21 20:32:34 -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
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
5a48f313cb
Merge pull request #6399 from paprka/radioshit
...
Removes useless standard encryption keys from headsets
2014-12-21 05:08:10 +00:00
9a27fe7c8d
Conflict fix
...
Yeah makes it all work
2014-12-21 06:12:33 +03:00
80a4bc285d
Adds empgrenade inhand, removes missed comment
2014-12-19 18:11:27 -07:00
f1963ce537
Merge branch 'master' of https://github.com/tgstation/-tg-station into parahats
...
Conflicts:
code/modules/clothing/head/soft_caps.dm
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2014-12-19 10:41:27 -08: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
Remie Richards
paprka
tkdrg
phil235
Razharas
hornygranny
Cheridan
Razharas
TZK13
MrPerson
Delimusca
Cheridan