fe5fb2c0f8
Merge remote-tracking branch 'upstream/master' into job_refactor_tg
2017-02-25 05:42:47 -08:00
fbed82b080
Merge pull request #6570 from SamHPurp/no-ghost-spin
...
Refactors the Chair Rotate verb
2017-02-25 06:51:57 -05:00
83e616d8d8
Removes a superfluous return
...
Hopefully the final change..
2017-02-25 09:08:41 +00:00
1044b2b84d
Merge pull request #6515 from Crazylemon64/fast_servermonitor
...
Telecomms monitor is speedier now
2017-02-24 23:25:47 -05:00
2f8feff402
Refactors tcomms stuff a little
2017-02-24 18:10:08 -08:00
e1abe58da7
Fixes indentation
2017-02-24 20:09:17 +00:00
79d5d7dc0c
Removes an unnecessary 'else' statement
...
Tidies the code up a bit more
2017-02-24 20:05:59 +00:00
45c9a3e550
Merge pull request #6573 from Markolie/zefix
...
Fixes
2017-02-24 14:57:38 -05:00
8b1a53b2d0
Merge pull request #6536 from SamHPurp/dethroning
...
Moves crown to cargo crate
2017-02-24 14:54:12 -05:00
d376c1a5da
Now uses setDir
...
Tested, and didn't break anything.
2017-02-22 23:38:43 +00:00
cde421e0eb
Refactoring of the Rotate verb
...
removes a few unnecessary checks. Still not using setDir yet, as I have
yet to work out how it works. To come!
2017-02-22 23:07:18 +00:00
c5b897a951
Fix fax machine logout issue, fix card eject telekinesis interaction, fix death alarm follow link, fix flavor text not hiding when unknown, fix spacepod mining lasers
2017-02-22 18:24:43 +01:00
5bc8c45e82
Stops ghosts from interacting with chairs
...
Removes the ability for ghosts to spin chairs.
2017-02-22 13:41:29 +00:00
3d86a56471
Fix recharge station overstacking things, megaphones being usable by mute people and ranged guardian cooldown
2017-02-20 17:30:29 +01:00
d3e3ed24a4
Dethrones captain, adds crown to hat crate
...
Removes crown from Captain locker & adds to collectible hat crate
2017-02-20 12:53:12 +00:00
f42b9cf383
Merge branch 'master' into admin_interact
2017-02-18 15:41:16 +01:00
e7023fd032
Refactored 'select equipment' to use outfit datums
...
Also moved outfit datum files to code/datum/outfits/, because I had
nowhere better to put all of the admin equipment- job stuff is still
with jobs
2017-02-17 16:17:59 -08:00
4754d6b4b3
Fixes some sounds not being cached properly
2017-02-17 02:37:26 -05:00
e89bbcd9c1
Merge pull request #6330 from FlimFlamm/box_sprite_addition
...
Large Cardboard Box Decals/Sprites
2017-02-14 23:12:41 -08:00
35653d0cee
Merge pull request #6380 from uraniummeltdown/tanksprites
...
New Tank Sprites
2017-02-14 21:32:53 -08:00
2e6f341f70
Merge pull request #6388 from DrunkDwarf/rcd-airlock-name2
...
Allows the Rapid Construction Device to set the name of a constructed Airlock
2017-02-14 13:34:21 -08:00
078ca5dd92
Fix examine
2017-02-13 19:30:22 +01:00
5c177320c3
Fix remaining welding tool inhands
2017-02-13 19:26:18 +01:00
e3eac9cdc7
Fix KA reskin mods and welding tool inhand
2017-02-13 19:12:26 +01:00
c4dd6f533f
Merge remote-tracking branch 'remotes/upstream/master' into tanksprites
...
# Conflicts:
# icons/mob/inhands/items_lefthand.dmi
# icons/mob/inhands/items_righthand.dmi
2017-02-13 21:01:58 +04:00
39f5b5a5ef
Merge pull request #6395 from uraniummeltdown/movetools
...
Move tools into tools.dmi, RSF sprite
2017-02-13 06:02:13 -05:00
0e96552cf8
added back and belt sprites, double tanks use old belt sprites
2017-02-13 06:24:51 +04:00
f701813f6e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into admin_interact
...
# Conflicts:
# code/modules/client/client defines.dm
2017-02-12 00:03:49 +01:00
0aabf436db
Fix ion trail effect
2017-02-11 20:33:26 +01:00
900653ea0e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx
2017-02-11 20:31:23 +01:00
3df3688e72
move all crates to crates.dmi
2017-02-11 17:44:20 +04:00
e03981aa02
formatting tools.dm
2017-02-11 15:47:25 +04:00
1edc9a63e8
add rsf icon+inhand from /vg/, move crowbar,cutters,screwdriver,welders,wrench,rcd,rsf to tools.dmi
2017-02-11 15:46:38 +04:00
1bdc663053
add inhand sprites for tanks
2017-02-11 13:06:54 +04:00
04f5276047
Merge pull request #6350 from Markolie/lavaland_updates
...
Add remaining Lavaland loot, kinetic accelerator refactor
2017-02-11 00:02:42 -05:00
cef7f35ce3
Merge pull request #6161 from tigercat2000/goonlights
...
Goonlights
2017-02-10 19:21:20 -08:00
17281506d2
Merge pull request #6123 from KasparoVy/vulp-cblind
...
Vulpkanin & Tajara mod. Colour Vision, Darksight to Eyes, Internal Mech(assist) Organ Icons
2017-02-10 18:27:58 -08:00
ac69d35538
Merge pull request #6381 from Fox-McCloud/slaughter-fix
...
Fixes Slaughter Demon Bloodcrawl and Demonic Whisper
2017-02-10 17:19:54 -08:00
c087647cce
Allows RCD to set constructed Airlocks name
...
Adds a new section of the Airlock menu of the Rapid Construction Device
so as to allow the user to specify the name the newly constructed
Airlock should have.
2017-02-10 18:57:04 +00:00
dec9bc71ac
Fix music import runtime
2017-02-10 18:59:58 +01:00
a4422a41ee
Re-add anchored check
2017-02-10 18:57:57 +01:00
b0d4f5d92a
Various fixes
2017-02-10 18:55:23 +01:00
c14b560ee0
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx
2017-02-10 18:21:06 +01:00
c93a592102
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
...
# Conflicts:
# code/modules/shuttle/supply.dm
2017-02-10 18:19:53 +01:00
0117892f54
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into admin_interact
...
# Conflicts:
# code/game/machinery/doors/firedoor.dm
2017-02-10 18:18:29 +01:00
0ebd41b05e
Fixes Slaughter Demon Bloodcrawl
2017-02-10 08:26:28 -05:00
2afd77a54a
Split admin interaction into regular and advanced, make more devices ghost-interactable
2017-02-09 19:30:36 +01:00
ed5ea305cc
Add "Syndicate" prefix to Syndicate pAI card
2017-02-09 18:56:05 +01:00
95f750d6f2
Add faction support to pAI's
2017-02-09 18:54:26 +01:00
ebed2adc55
This commit updates the name of the new "cardboard_boxes.dmi" file (from boxes.dmi) to prevent future confusion with regular boxes.
2017-02-09 02:08:41 -04:00
Tigercat2000