tkdrg
cdb5066502
Merge pull request #6324 from Razharas/GenShit
...
Added datum mutations
2014-12-31 17:24:15 -03:00
phil235
e476074b32
Merge pull request #6673 from GunHog/FixForTatorAIRadioAndRemovesSpice
...
Fixes #6654
2014-12-31 15:41:17 +01:00
phil235
3ce15f31b0
Merge pull request #6672 from Menshin/flash_emp_runtime_fix
...
Fixes flashes runtiming on EMP + flash spamming
2014-12-31 15:33:20 +01:00
Menshin
34cee3f088
Renamed confusing variable
2014-12-31 13:51:39 +01:00
tkdrg
829ba09986
Merge pull request #6244 from Ergovisavi/halp_medics_griffon_me
...
Adds Medical Hologram functionality to Medical Penlight
2014-12-30 20:52:46 -03:00
Razharas
d1f347f584
Fixes conflicts
...
There werent even any conflicts really, but git for some reason thought
there are
2014-12-30 15:12:09 +03:00
Razharas
084d193409
Fixed dualsabers and hulks
...
Fixed dualsabers and hulks
2014-12-30 14:47:07 +03:00
Perakp
ee3617310e
Merge remote-tracking branch 'upstream/master' into droneFix
2014-12-30 13:32:51 +02:00
Menshin
168b98840f
Fixes flashes runtiming on emp_act()
...
Fixes flash messages spam (#6631 )
Some code cleaning
2014-12-30 10:50:43 +01:00
tkdrg
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
Ergovisavi
f3251c7224
Adds a Medical Hologram functionality to the medical penlight
2014-12-29 21:44:44 -08:00
hornygranny
9ee5d52814
Merge pull request #6601 from paprka/walkthecat
...
Adds catwalks
2014-12-29 19:05:41 -08:00
GunHog
4f3d955ca1
Fixes #6654
...
Sets the AI's encryption key to slot 2 so it is not lost upon the AI
being traitorized.
Fixes #6654 by reverting the change in #6399 to the AI's key.
2014-12-29 19:55:01 -06:00
Ergovisavi
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
tkdrg
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
Razharas
501a120cca
Fixes the defines
...
Now all the shit uses them i hope
2014-12-29 16:25:33 +03:00
paprka
58b10962dc
clicking on the lattice will now construct a catwalk as well
2014-12-29 05:24:48 -08:00
Razharas
10b21b20ab
Conflicts resolution
...
In items weapons melee misc
2014-12-29 11:49:30 +03:00
Razharas
418e3a0613
General cleanup
...
Fixed the magic text failing in monkey injectors
Removed lots of comments
Didnt fix mysterious list bounds runtime in tourettes
2014-12-29 11:36:01 +03:00
paprka
152be974dc
reverts return change (returns return change?)
2014-12-28 18:53:44 -08:00
paprka
bbc83fed1c
Merge branch 'master' of https://github.com/tgstation/-tg-station into policebatonfixy
2014-12-28 18:39:39 -08:00
tkdrg
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
paprka
e8738e8dd5
Changes some clothing and chef gear
2014-12-28 02:13:28 -08:00
Razharas
76a21883a8
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
...
Conflicts:
code/game/mecha/mecha.dm
code/game/objects/structures/tables_racks.dm
code/modules/mob/living/silicon/silicon.dm
code/modules/projectiles/gun.dm
Fixes dem conflicts
2014-12-28 11:20:15 +03:00
paprka
acd40bdde8
further updates smoothing and icons
2014-12-28 00:17:19 -08:00
Razharas
208b59c30e
Fixed stuff tkdrg pointed out
...
Added comment to dualsaber and hulk checks to explain whats going on
Added defines that converts to mutation names
Fixed grammer again
2014-12-28 10:49:04 +03:00
paprka
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
tkdrg
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
phil235
a614839f82
Merge pull request #6573 from paprka/fixescaps
...
Fixes capgun ammo sprites
2014-12-27 18:14:28 +01:00
tkdrg
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
Swag McYolosteinen
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
tkdrg
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
tkdrg
0b4261e016
Merge pull request #6355 from AnturK/librarian_pda
...
Adds Librarian PDA cartridge
2014-12-27 01:44:49 -03:00
paprka
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
Remie Richards
1f288f56ae
Merge pull request #6290 from Xhuis/porta_console
...
Handheld crew monitor
2014-12-27 01:43:42 +00:00
paprka
3ca6d769a1
adds catwalks
2014-12-26 17:38:55 -08:00
tkdrg
f0cc5cce4d
Merge pull request #6330 from RemieRichards/MapperFriendlySoundTrigger
...
Simple sound effect map object
2014-12-26 22:36:55 -03:00
Remie Richards
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
tkdrg
fe139e437d
RPD tweaks
...
Turns the pipe modes into defines and adds some span classes
2014-12-26 20:50:34 -03:00
paprka
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
phil235
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
Razharas
7eb69190e7
Merge pull request #6356 from paprka/burtsfiya
...
Burst fire for some projectile weapons
2014-12-26 08:38:21 +03:00
hornygranny
09b4b7a3cc
Merge pull request #6554 from paprka/jetpackssuck
...
Makes jetpacks more obvious when they're on
2014-12-25 21:25:56 -08:00
paprka
5e02790327
fixes capgun ammo sprites
2014-12-25 18:15:45 -08:00
tkdrg
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
Cheridan
12ad2b796d
Merge pull request #6541 from phil235/GrenadeAssemblyConstructionFailMsgFix
...
Assembly holder no longer needs to be secured.
2014-12-25 16:16:00 -06:00
paprka
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
Cheridan
5d2994eb35
Merge pull request #6526 from paprka/secondchef
...
Adds second chef position / Renames chef to cook
2014-12-25 15:30:00 -06:00
paprka
404da4dbdd
code optimizations
2014-12-25 13:28:05 -08:00
paprka
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
