f72ced26fd
PulseRifleVarients+ArmouryRooms+FixesAndRefinements
2015-01-01 13:33:23 +08:00
dd111a7c54
EmergencyResponseTeam
2014-12-31 17:31:45 +08:00
ee3617310e
Merge remote-tracking branch 'upstream/master' into droneFix
2014-12-30 13:32:51 +02:00
2607a456c0
Merge pull request #6634 from paprka/chefuniform
...
Makes the second cook spawn in short order cook clothes, fixes chef uniform
2014-12-30 03:45:13 -03:00
9ee5d52814
Merge pull request #6601 from paprka/walkthecat
...
Adds catwalks
2014-12-29 19:05:41 -08:00
d7765cd75f
Merge pull request #6630 from tkdrg/rpdcolor
...
Tested, appears to be functioning as advertised. Cue drones making absurd disposal rides.
2014-12-29 11:14:20 -08:00
d96e8df573
Fixes some RPD bugs
...
Fixes pipe painting not working
Fixes 4-way manifolds and disposals chutes displaying broken icons
Fixes the lack of Sort Junctions from the RPD
Fixes #6627
Fixes drones being unable to use the RPD
2014-12-29 14:51:41 -03:00
58b10962dc
clicking on the lattice will now construct a catwalk as well
2014-12-29 05:24:48 -08:00
152be974dc
reverts return change (returns return change?)
2014-12-28 18:53:44 -08:00
bbc83fed1c
Merge branch 'master' of https://github.com/tgstation/-tg-station into policebatonfixy
2014-12-28 18:39:39 -08:00
91685820f2
Merge pull request #6588 from phil235/WindowEjectionFix
...
Removed the ability of windows to be unanchored and ejected when low on health
2014-12-28 21:20:02 -03:00
e8738e8dd5
Changes some clothing and chef gear
2014-12-28 02:13:28 -08:00
acd40bdde8
further updates smoothing and icons
2014-12-28 00:17:19 -08:00
79e2eedacb
Merge branch 'master' of https://github.com/tgstation/-tg-station into walkthecat
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2014-12-27 22:26:21 -08:00
cc474b2af6
Merge pull request #6591 from phil235/FingerlessSpriteFix
...
Fix fingerless gloves icon and washing machine changing boxing gloves
2014-12-27 15:46:43 -03:00
a614839f82
Merge pull request #6573 from paprka/fixescaps
...
Fixes capgun ammo sprites
2014-12-27 18:14:28 +01:00
517d17d9e2
Merge pull request #6585 from phil235/SwirlieFix
...
Fixed being able to spam slam someone onto a toilet during a swirlie.
2014-12-27 10:33:24 -03:00
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
fc7c7b520d
Merge pull request #6348 from paprka/highspeednodrag1v1mem80quickscopenotaser
...
Blood-red hardsuit usability feature and syndicate loadout adjustments
2014-12-27 02:59:24 -03:00
0b4261e016
Merge pull request #6355 from AnturK/librarian_pda
...
Adds Librarian PDA cartridge
2014-12-27 01:44:49 -03:00
0e4903bd83
Merge branch 'master' of https://github.com/tgstation/-tg-station into walkthecat
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2014-12-26 18:35:12 -08:00
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
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
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
Steelpoint
Perakp
tkdrg
hornygranny
Ergovisavi
paprka
phil235
Swag McYolosteinen
Remie Richards
phil235
Razharas
Cheridan