Cheridan
2abaa2b0f1
Merge pull request #13045 from KorPhaeron/laserbox
...
Fixes reflector structure being on a low layer
2015-11-28 20:42:21 -06:00
KorPhaeron
4245481019
Lower layer but still higher than it was
2015-11-28 18:48:42 -06:00
PKPenguin321
8e09b00f2c
Merged upstream
2015-11-28 15:49:41 -08:00
Cheridan
2fc49bbcad
Merge pull request #13265 from PKPenguin321/kor-you-lazy-fuck
...
Mounted Chainsaw Inhands 2.0
2015-11-28 17:01:35 -06:00
PKPenguin321
36d92b8c2d
fixes everything
...
i broke everything by giving teleprods a unique attack_self but forgetting to include the original functions of attack_self, making them unable to turn on/off. this fixes that.
2015-11-28 14:57:36 -08:00
Razharas
e715e1cc57
Merge pull request #13195 from neersighted/nanoui_update
...
[WIP|DNM] Update NanoUI
2015-11-28 14:17:49 +03:00
PKPenguin321
5382db940d
adds mounted chainsaw inhands, repaths mounted chainsaws to actually use them, makes the lines for mounted chainsaws use tabs instead of filthy spaces
2015-11-27 14:56:23 -08:00
Dorsisdwarf
592553354f
Merge pull request #12899 from TechnoAlchemisto/master
...
Makes cloaks into Exosuits as god(I) intended.v2
2015-11-27 22:22:47 +00:00
Remie Richards
b6209e4508
Merge pull request #13139 from AnturK/XXXFREEINSULATEDSWITHEVERYPURCHASEXXX
...
Adds Send To All to Lawyer/Captain cartridges
2015-11-27 20:58:03 +00:00
Remie Richards
f55246e5c0
Merge pull request #12987 from AnturK/turrets
...
Removes gun_turret type and makes turret controls buildable
2015-11-27 20:52:59 +00:00
Remie Richards
62d301bfe5
Merge pull request #12998 from YotaXP/drone-fixes
...
Allows drones to use 'pick up' and watertanks
2015-11-27 20:38:23 +00:00
Bjorn Neergaard
5f108eef4e
Merge remote-tracking branch 'tgstation/master' into nanoui_update
2015-11-27 15:31:35 -05:00
Bjorn Neergaard
b897fb6d72
Fix NanoUIs flashing, update Tanks, Solars, and Canisters
2015-11-27 15:30:18 -05:00
YotaXP
68dbc7cf27
Code formatting!
...
Dat online PR editor.
2015-11-27 15:18:16 -05:00
Remie Richards
fdede51a09
Merge pull request #12954 from MMMiracles/spookycaves
...
New Away Mission: Caves
2015-11-27 20:11:26 +00:00
duncathan salt
383e77db8a
Merge pull request #13220 from KorPhaeron/godwillsit
...
Adds knight armour
2015-11-27 13:58:08 -06:00
PKPenguin321
cf29721672
fixes conflicts, adds the ability to remove the crystal from the prod via using it when no cell is attached
2015-11-26 18:28:12 -08:00
PKPenguin321
7e640d3463
Merge branch 'master' of https://github.com/tgstation/-tg-station into teleprods
2015-11-26 17:42:59 -08:00
AnturK
e36853d7c9
Convert bots to simple animals - Updated 7.0
2015-11-26 22:06:07 +01:00
Bjorn Neergaard
1a44e3d851
Refactor NanoUI API
...
Also update NanoUI-using code to the new API.
2015-11-26 07:11:31 -05:00
Aranclanos
e68a5b773a
Merge pull request #13173 from swankcookie/SuperMatter_Sword_fix
...
Supermatter Sword no longer gets bloody
2015-11-26 08:33:56 -03:00
MMMiracles
2d94b0ff9b
feedback changes:
...
added more loot
nerfed the spawn rates and health of the spawners
widened the paths of some areas for lava passages
added a medbay area to the first level incase of stupid people not coming prepared
added 2 mining rigsuits, may be difficult to get though
fixed(?) issues with dicklys drilling ladders and basalt floors causing issues
2015-11-25 23:24:42 -05:00
PKPenguin321
67153e54d3
fixes tgstation.dme since i cucked it by unticking a file accidentally, also makes the teleprods use the correct inhands
2015-11-25 19:03:28 -08:00
PKPenguin321
10f9e4af4f
adds teleprods, a way to make them with bluespace crystals and a stunprod, and a tablecrafting recipe
2015-11-25 18:36:09 -08:00
KorPhaeron
c8f3ca728f
Adds Knight Armour
2015-11-25 15:46:54 -06:00
Razharas
e0508ad572
Merge pull request #13050 from MrStonedOne/connectlagfixthankspjb
...
[Ready] Fixes the 2 minutes of interface lag (such as ready button not working) when a client connects.
2015-11-25 20:43:45 +03:00
AnturK
e93fc3c6d2
Turrets now need to be linked to built turret controls using multiool. Map-placed ones autolink as before
...
Changes multitool buffer type to better reflect the use
2015-11-25 14:41:20 +01:00
MrStonedOne
ca4f4201e7
Asset Cache improvements!
...
Adds crew monitor to the asset cache system
Adds paper to the asset cache system
Added a way to send files to the client slowly without clogging up the queue. (This isn't technically "safe", but the client would only have issues if they didn't have that file already (rare), and only if they used a window that needed that asset (currently only nanoui windows) within the first 15 to 90 seconds of connecting (depending on ping))
Makes NanoUI use this slow send system to blindly send it's asset files. (Once bay's nanoui is ported, i'll improve this so that nanoui fully implements asset cache checking)
Makes asset cache use this system to send all registered asset files, so that ui windows don't have to wait for them if the client's been connected a while.
2015-11-25 02:11:04 -08:00
Aranclanos
0f1945bef6
Merge pull request #13051 from kingofkosmos/enableidtopdaonfloor
...
ID into PDA without PDA in your inventory and a few other similar things
2015-11-23 20:27:07 -03:00
AnturK
05cb510dc7
Neater
2015-11-23 19:31:28 +01:00
swankcookie
d56c24f841
SM Sword
2015-11-22 23:44:23 -06:00
phil235
77de108fe7
Merge pull request #13143 from Anonus/blobactors
...
Fixes up blob_act()
2015-11-22 18:42:15 +01:00
phil235
ab1e9f2d15
Merge pull request #13160 from Firecage/optablefix
...
Fixes op table buckling Take #2
2015-11-22 18:38:19 +01:00
Firecage
e1891440fa
Fixes op table buckling
2015-11-22 19:29:26 +02:00
AnturK
caa07f84c4
Adds Send To All to Lawyer/Captain cartridges
2015-11-21 12:24:41 +01:00
Nerd Lord
f458c2cead
The blob eats nondense things in all cases.
...
Probably fixes one or two bugs in the process.
2015-11-20 21:03:43 -05:00
octareenroon91
d2fa527045
Add numbers and star graffiti to crayon/spraycan designs.
2015-11-19 17:24:09 -06:00
Cheridan
4c899d2b34
Merge pull request #13063 from Incoming5643/subtypesof
...
Adds subtypesof(path)
2015-11-19 16:31:09 -06:00
Cheridan
1edef8ac6a
Merge pull request #13068 from tkdrg/rollitbaby
...
Fixes roller bed teleportation exploit
2015-11-19 14:38:29 -06:00
Remie Richards
7333bede43
Merge pull request #13055 from Anonus/actionbuttons
...
Gives constructs action buttons, adds cool effects to cult turfs.
2015-11-18 20:26:47 +00:00
Nerd Lord
9437d6fc27
BETTER workaround.
2015-11-18 15:21:04 -05:00
Cheridan
cba8a9a325
Merge branch 'c4runtimeFix' of git://github.com/phil235/-tg-station into phil235-c4runtimeFix
...
Conflicts:
code/modules/mob/mob.dm
2015-11-18 01:44:29 -06:00
kingofkosmos
a121b9308c
Removes unneeded restrained-warnings and one canUseTopic-check.
2015-11-18 06:08:31 +02:00
kingofkosmos
38e5420832
Removes can_use -proc from PDA.dm and replaces all instances of it with canUseTopic.
...
Adds kingofkosmos to admins.txt
2015-11-17 21:26:42 +02:00
Nerd Lord
a183e0474d
Pooling is good for the soul.
2015-11-17 11:27:26 -05:00
Razharas
b3ed636d3c
Merge pull request #13034 from kingofkosmos/shardspacenoslip
...
Stops glass shards from hurting you in space
2015-11-17 05:33:15 +03:00
Tkdrg
292ba6c046
Fixes roller bed teleportation exploit
...
Thanks swankcookie for reporting this to me ingame.
2015-11-16 22:30:26 -03:00
Incoming
1f9f0dfc40
Adds subtypesof(). It's shorthand for typesof(path) - path.
...
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
2015-11-16 18:55:57 -05:00
Nerd Lord
757d009e4f
Constructs now have action buttons!
...
Cult floors and walls now have a glow effect when spawning in.
Nar-Sie uses a span class just for it spawning. Get spook.
2015-11-16 15:20:13 -05:00
kingofkosmos
62987c0716
Enables putting an ID into a PDA when the PDA not in your inventory.
2015-11-16 20:41:11 +02:00
