a5dfafd0d4
Merge pull request #13197 from MrStonedOne/revert-12977-reverttimedinjectors
...
Revert "Properly reverts timed injectors"
2015-11-28 22:46:36 -06:00
2abaa2b0f1
Merge pull request #13045 from KorPhaeron/laserbox
...
Fixes reflector structure being on a low layer
2015-11-28 20:42:21 -06:00
4245481019
Lower layer but still higher than it was
2015-11-28 18:48:42 -06: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
e715e1cc57
Merge pull request #13195 from neersighted/nanoui_update
...
[WIP|DNM] Update NanoUI
2015-11-28 14:17:49 +03:00
2feedfa009
Update Cryo, NanoUI states, add new contains() helper
2015-11-27 21:21:52 -05: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
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
b6209e4508
Merge pull request #13139 from AnturK/XXXFREEINSULATEDSWITHEVERYPURCHASEXXX
...
Adds Send To All to Lawyer/Captain cartridges
2015-11-27 20:58:03 +00:00
cce47616c0
Merge pull request #13217 from AnturK/shuttlelight
...
Makes shuttle turf copy use proper helper.
2015-11-27 20:56:55 +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
18feac742a
Stuff
2015-11-27 21:31:47 +01: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
fa8237f270
Merge pull request #13215 from tkdrg/fuckthenuke
...
Nukes will no longer nuke the MC sometimes
2015-11-27 20:12:33 +00:00
fdede51a09
Merge pull request #12954 from MMMiracles/spookycaves
...
New Away Mission: Caves
2015-11-27 20:11:26 +00:00
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
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
383e77db8a
Merge pull request #13220 from KorPhaeron/godwillsit
...
Adds knight armour
2015-11-27 13:58:08 -06:00
da0ba3659f
Merge pull request #13239 from AnturK/animalbots
...
Simple Animal Bots - Beepsky strikes back.
2015-11-27 17:37:59 +01:00
5f5d8bca95
did you know this is the final change? no.
2015-11-27 01:01:43 -05:00
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
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
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
e36853d7c9
Convert bots to simple animals - Updated 7.0
2015-11-26 22:06:07 +01:00
9ce7bf442e
Further UI Improvements
...
Finish redesign of APC and Air Alarm
2015-11-26 12:41:16 -05:00
0ca0b79464
Further re-work APCs and Air Alarms
2015-11-26 07:46:52 -05:00
1a44e3d851
Refactor NanoUI API
...
Also update NanoUI-using code to the new API.
2015-11-26 07:11:31 -05:00
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
e68a5b773a
Merge pull request #13173 from swankcookie/SuperMatter_Sword_fix
...
Supermatter Sword no longer gets bloody
2015-11-26 08:33:56 -03:00
cb3a30c685
Merge pull request #13207 from JJRcop/i12302
...
Fixes blob broadcast working with dead blobbernauts
2015-11-26 07:07:30 -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
ef7dc5c6b2
rip hole, map is ready.
...
added spawners for all mining mobs.
2015-11-25 18:32:05 -05:00
9fe9c2faa4
Remove side effects from Character Setup
2015-11-25 18:06:05 -05:00
c8f3ca728f
Adds Knight Armour
2015-11-25 15:46:54 -06:00
d71e310390
Makes shuttle turf copy use proper helper.
2015-11-25 21:19:36 +01:00
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
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
6c2cb63ff0
Makes syndie/hog turrets ignore emp
2015-11-25 14:41:19 +01:00
48533846cd
typo fix
2015-11-25 14:41:19 +01:00
c9dc0b7998
Makes turret control panels buildable
2015-11-25 14:41:18 +01:00
0524045bef
Removes gun turrets
2015-11-25 14:41:17 +01:00
duncathan salt
Cheridan
KorPhaeron
PKPenguin321
Razharas
Bjorn Neergaard
Dorsisdwarf
Remie Richards
AnturK
YotaXP
phil235
MMMiracles
Tkdrg
Aranclanos
YotaXP
KorPhaeron