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
Incoming5643
c261aa30e5
adds functionality to catch dsay and asay mistakes, moves the check below things like OOC muting
2015-11-27 17:03:40 -05: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
cce47616c0
Merge pull request #13217 from AnturK/shuttlelight
...
Makes shuttle turf copy use proper helper.
2015-11-27 20:56:55 +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
Vincent
0218d51938
Better fireaxe-grill interactions
2015-11-27 15:38:37 -05: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
AnturK
18feac742a
Stuff
2015-11-27 21:31:47 +01: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
fa8237f270
Merge pull request #13215 from tkdrg/fuckthenuke
...
Nukes will no longer nuke the MC sometimes
2015-11-27 20:12:33 +00:00
Remie Richards
fdede51a09
Merge pull request #12954 from MMMiracles/spookycaves
...
New Away Mission: Caves
2015-11-27 20:11:26 +00:00
Remie Richards
a5f582a2ea
Merge pull request #13172 from neersighted/wood_barricade_bullets
...
Fix Wooden Barricades not taking bullet damage
2015-11-27 20:03:19 +00:00
Remie Richards
08aee6ce4f
Merge pull request #12965 from Shadowlight213/conversionbanfixes
...
Makes the conversion jobban replacement use the new antag flags
2015-11-27 20:02:45 +00:00
duncathan salt
383e77db8a
Merge pull request #13220 from KorPhaeron/godwillsit
...
Adds knight armour
2015-11-27 13:58:08 -06:00
phil235
da0ba3659f
Merge pull request #13239 from AnturK/animalbots
...
Simple Animal Bots - Beepsky strikes back.
2015-11-27 17:37:59 +01:00
MMMiracles
5f5d8bca95
did you know this is the final change? no.
2015-11-27 01:01:43 -05:00
Tkdrg
bec0d04e98
Nukes will no longer lock the MC sometimes
...
Fixes #3956
Also updates CONTRIBUTING.md on the newline policy.
2015-11-27 00:25:08 -03:00
as334
ce9ea0ca46
FUCK THIS FUCK EVERYTHING
2015-11-26 22:22:07 -05: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
Vincent
026e6ee772
Sets up the the ABSTRACT flag to be used by machines and structures that should not be disassembled or break into parts.
...
This is specifically used by the holodeck for things that should be immune to disassembly.
Fixes invisible windoors in the holodeck.
Standardizes the fire axe's interaction with windows.
Fixes a runtime with holodeck tiles getting broken or burned.
2015-11-26 21:11:54 -05:00
PKPenguin321
7e640d3463
Merge branch 'master' of https://github.com/tgstation/-tg-station into teleprods
2015-11-26 17:42:59 -08:00
Cheridan
762568255d
Merge pull request #13102 from bgobandit/newmininggear
...
Various mining additions, fixes, nerfs and buffs (ready for review/merge).
2015-11-26 18:11:26 -06:00
bgobandit
9df0dfe2c0
Fixes dominator error message issue.
2015-11-26 17:46:35 -05:00
ktccd
bf7fb2aa8c
Fixed looking up the /area of the loc, not the turf.
...
I messed up, thanks Aranclanos!
2015-11-26 22:48:36 +01:00
AnturK
e36853d7c9
Convert bots to simple animals - Updated 7.0
2015-11-26 22:06:07 +01:00
Bjorn Neergaard
9ce7bf442e
Further UI Improvements
...
Finish redesign of APC and Air Alarm
2015-11-26 12:41:16 -05:00
Bjorn Neergaard
0ca0b79464
Further re-work APCs and Air Alarms
2015-11-26 07:46:52 -05:00
Bjorn Neergaard
1a44e3d851
Refactor NanoUI API
...
Also update NanoUI-using code to the new API.
2015-11-26 07:11:31 -05:00
Bjorn Neergaard
4e5edf396a
Update NanoUI
...
* Update NanoUI to the latest version, ported from Baystation12
* Update the Air Alarm UI
* Make changes to subsystems and some machines to make the new NanoUI
work
2015-11-26 07:11:27 -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
Aranclanos
cb3a30c685
Merge pull request #13207 from JJRcop/i12302
...
Fixes blob broadcast working with dead blobbernauts
2015-11-26 07:07:30 -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
JJRcop
fd335fc045
Changeling add_profile now only adds profile
...
refactored old functionality into add_new_profile and changes all previous usage to add_new_profile
2015-11-25 21:25:47 -05:00
MMMiracles
ef7dc5c6b2
rip hole, map is ready.
...
added spawners for all mining mobs.
2015-11-25 18:32:05 -05:00
YotaXP
9fe9c2faa4
Remove side effects from Character Setup
2015-11-25 18:06:05 -05:00
KorPhaeron
c8f3ca728f
Adds Knight Armour
2015-11-25 15:46:54 -06:00
AnturK
d71e310390
Makes shuttle turf copy use proper helper.
2015-11-25 21:19:36 +01:00
Razharas
e3a78d1be3
Merge pull request #13175 from Incoming5643/stop_meming_on_wizbiz
...
Removes the most ridiculous of the new wizard weapons
2015-11-25 20:44:04 +03: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
AnturK
6c2cb63ff0
Makes syndie/hog turrets ignore emp
2015-11-25 14:41:19 +01:00
AnturK
48533846cd
typo fix
2015-11-25 14:41:19 +01:00
AnturK
c9dc0b7998
Makes turret control panels buildable
2015-11-25 14:41:18 +01:00
AnturK
0524045bef
Removes gun turrets
2015-11-25 14:41:17 +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
JJRcop
453e9e9100
Fixes blob broadcast working with dead blobbernauts
2015-11-25 01:07:47 -05:00