dc98e67f05
Just fuck my shit up fam
2015-11-29 13:48:58 -05:00
921c9eede1
Asset cache Fixes
...
Fixes asset cache locking up the MC initialization at world start.
Fixes asset cache not pre-loading resources to clients that connect from a world reboot.
Fixes a null reference runtime relating to the client disconnecting at the wrong time (I still conciser this to be a byond bug)
Fixes crew monitor registering assets because they exist
Fixes crew monitor trying to send zlevel assets for zlevels it hasn't processed.
Fixes nano ui sometimes not sending the template asset to the client on open.
2015-11-29 07:19:49 -08:00
fd96c313a7
Merge pull request #13248 from bgobandit/dominatorfix
...
Fixes dominator error message issue.
2015-11-29 21:08:38 +11:00
e9ea0d8dc9
Merge pull request #13275 from swankcookie/snowman
...
Adds Snowman costume
2015-11-29 21:08:11 +11:00
aa672d3e95
Merge pull request #13230 from JJRcop/i12317
...
Fixes changeling hivemind download
2015-11-29 21:07:18 +11:00
56c2659736
Merge pull request #13187 from ktccd/master
...
Fixes areas blobs shouldn't win from spreading to.
2015-11-29 21:06:46 +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
97a3b3f3c7
Merge pull request #13097 from RemieRichards/patch-2
...
Updates Holopad code to use AltClick
2015-11-29 21:05:50 +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
4314b0924a
Merge pull request #13203 from Incoming5643/g_absorbing_the_joke
...
Removes Accidental IC in OOC
2015-11-29 12:14:10 +03:00
611fb49c1c
Wake me up inside
2015-11-29 00:58:30 -05:00
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
9a434b669c
Academy Fixes
2015-11-28 23:17:57 +01:00
b662b470a9
Enables ghost to go through ladders
...
Adds Cold snow turf
Adds Infinite Candles
2015-11-28 18:14:52 +01:00
b14e9133d2
Academy Update
2015-11-28 12:35:41 +01:00
9fd9e5c21d
Makes user explicit in spell code
2015-11-28 12:35:40 +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
192460d4a9
fixed space
2015-11-28 02:50:58 -06:00
ac820f4ec2
adds snowman hat and suit to autodrobe
2015-11-28 02:40:03 -06:00
2feedfa009
Update Cryo, NanoUI states, add new contains() helper
2015-11-27 21:21:52 -05:00
6fe6db75be
Brings code up to current specs
...
Also removes some of my unneded comments.
2015-11-28 01:57:28 +01:00
b269e5bab8
Update to bring code in line with standards
...
Removes some unecessary text as well.
2015-11-28 01:27:29 +01:00
395cd5a68c
Rewrote a bit of blob code to fix... a lot
...
Stuff fixed: My sad attempt at fixing #13126 .
The expand() proc for blobs is hopefully less intensive now (WHY did it
used to spawn a blob only to destroy it? That must've been such a
waste...).
Destroy code no longer needs to adjust for the expand() proc doing weird
things.
The antag panel will now show the correct variable used to determine
blob progress.
Renamed the variables I used so they're not so similar to each other.
blob_legit and blobs_legit was WAY to easy to mix up.
2015-11-28 01:06:27 +01: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
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
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
as334
MrStonedOne
Jordie
Razharas
duncathan salt
Cheridan
KorPhaeron
PKPenguin321
AnturK
swankcookie
Bjorn Neergaard
ktccd
Dorsisdwarf
Incoming5643
Remie Richards
YotaXP
phil235
MMMiracles
Tkdrg