78c95ab035
Merge pull request #13317 from neersighted/airlock_electronics
...
NanoUI Airlock Electronics
2015-11-30 20:43:33 +03:00
ad410e39d8
Merge pull request #13296 from neersighted/nanoui_checks
...
Fix some NanoUI checks
2015-11-29 18:36:18 -06:00
06e5df9336
Fix NanoUI missing assignment; use two-line ifs
2015-11-29 18:20:10 -05:00
f214e547cb
NanoUI Airlock Electronics
...
Also reworks a lot of the AE code.
2015-11-29 11:32:56 -06:00
e9ea0d8dc9
Merge pull request #13275 from swankcookie/snowman
...
Adds Snowman costume
2015-11-29 21:08:11 +11:00
38eddb1421
Merge pull request #13179 from AnturK/academy
...
Wizard Academy Away Update
2015-11-29 21:06:34 +11:00
da0c466f82
Merge pull request #13149 from Firecage/toolspeed
...
Adds toolspeed
2015-11-29 21:06:15 +11:00
06134d5f19
Merge pull request #13104 from GunHog/OfTeleportsAndNames
...
Hand Tele now displays its destination.
2015-11-29 21:06:01 +11:00
ee3e5c4d3f
Merge pull request #13074 from Yolopanther12/lightReplacerUpgrade
...
Adds Light Replacer Refilling With Box of Lights
2015-11-29 21:04:43 +11:00
8e09b00f2c
Merged upstream
2015-11-28 15:49:41 -08:00
2fc49bbcad
Merge pull request #13265 from PKPenguin321/kor-you-lazy-fuck
...
Mounted Chainsaw Inhands 2.0
2015-11-28 17:01:35 -06:00
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
b662b470a9
Enables ghost to go through ladders
...
Adds Cold snow turf
Adds Infinite Candles
2015-11-28 18:14:52 +01:00
e715e1cc57
Merge pull request #13195 from neersighted/nanoui_update
...
[WIP|DNM] Update NanoUI
2015-11-28 14:17:49 +03:00
0b7b49d8c4
fixes issue of missing suit and hat in vendor
2015-11-28 03:11:05 -06:00
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
b6209e4508
Merge pull request #13139 from AnturK/XXXFREEINSULATEDSWITHEVERYPURCHASEXXX
...
Adds Send To All to Lawyer/Captain cartridges
2015-11-27 20:58:03 +00:00
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
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
5f108eef4e
Merge remote-tracking branch 'tgstation/master' into nanoui_update
2015-11-27 15:31:35 -05:00
b897fb6d72
Fix NanoUIs flashing, update Tanks, Solars, and Canisters
2015-11-27 15:30:18 -05:00
68dbc7cf27
Code formatting!
...
Dat online PR editor.
2015-11-27 15:18:16 -05:00
fdede51a09
Merge pull request #12954 from MMMiracles/spookycaves
...
New Away Mission: Caves
2015-11-27 20:11:26 +00:00
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
7e640d3463
Merge branch 'master' of https://github.com/tgstation/-tg-station into teleprods
2015-11-26 17:42:59 -08:00
e36853d7c9
Convert bots to simple animals - Updated 7.0
2015-11-26 22:06:07 +01:00
1a44e3d851
Refactor NanoUI API
...
Also update NanoUI-using code to the new API.
2015-11-26 07:11:31 -05:00
e68a5b773a
Merge pull request #13173 from swankcookie/SuperMatter_Sword_fix
...
Supermatter Sword no longer gets bloody
2015-11-26 08:33:56 -03:00
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
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
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
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
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
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
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
05cb510dc7
Neater
2015-11-23 19:31:28 +01:00
d56c24f841
SM Sword
2015-11-22 23:44:23 -06:00
c933363062
Adds the toolspeed var and adds it to most usages of tools which has a timer
2015-11-21 19:24:14 +02:00
caa07f84c4
Adds Send To All to Lawyer/Captain cartridges
2015-11-21 12:24:41 +01:00
d2fa527045
Add numbers and star graffiti to crayon/spraycan designs.
2015-11-19 17:24:09 -06:00
4c899d2b34
Merge pull request #13063 from Incoming5643/subtypesof
...
Adds subtypesof(path)
2015-11-19 16:31:09 -06:00
e555811830
The Hand Tele now displays the target name.
...
The Hand Tele will now display the target's name before teleporting.
2015-11-18 18:35:57 -06:00
f767524d3e
Proper formatting of the notifications.
2015-11-18 00:52:16 -08:00
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
a121b9308c
Removes unneeded restrained-warnings and one canUseTopic-check.
2015-11-18 06:08:31 +02:00
922df5f02c
Single loop and looks nice.
2015-11-17 19:06:31 -08:00
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
12c7d7a90d
Now only loops through the content of the box once instead of twice.
2015-11-17 04:46:25 -08:00
93b5ef000c
replacing broken lights with broken lights since 1999
2015-11-16 23:21:08 -08:00
082538240e
Haha indentation fixes.
2015-11-16 19:40:26 -08:00
Razharas
duncathan salt
Bjorn Neergaard
Jordie
PKPenguin321
Cheridan
AnturK
swankcookie
Remie Richards
YotaXP
Aranclanos
MMMiracles
MrStonedOne
swankcookie
Firecage
octareenroon91
GunHog
Yolopanther
Cheridan
kingofkosmos