Commit Graph

12361 Commits

Author SHA1 Message Date
duncathan salt fd5423e0cc Merge pull request #13340 from KorPhaeron/oxy_tank
Internals start at 16 pressure
2015-12-02 14:16:29 -06:00
Remie Richards 29d1684757 Merge pull request #13343 from GunHog/L2TestNoob
Fixes inability to upgrade gun rechargers
2015-12-02 14:16:34 +00:00
Remie Richards d909c1e82d Merge pull request #13348 from neersighted/spooky_nanoui
Allow ghosts to use any NanoUI interface.
2015-12-02 14:15:33 +00:00
Jordie ae54bedc30 Merge pull request #13345 from neersighted/sstimer_lovin
Fix up SStimer, make Crew Console use SStimer
2015-12-02 15:53:53 +11:00
duncathan salt d616885241 Merge pull request #13338 from Incoming5643/tis_the_season_for_horrible_manual_placement
[Touching all the maps oh god] The reason for the season
2015-12-01 15:15:49 -06:00
Vincent bf530cc3dd Fixes untouchable windows
Sorry about that.  Fixes #13354
2015-12-01 11:54:09 -05:00
Bjorn Neergaard 6f098e8298 Allow ghosts to use any NanoUI interface. 2015-11-30 23:34:59 -05:00
Bjorn Neergaard 47e9a7771a Fix up SStimer, make Crew Console use SStimer
Remove crappy proc queue as well...
2015-11-30 20:56:45 -05:00
GunHog c09b880fa4 Fixes inability to upgrade gun rechargers
Adds missing exchange_parts() proc
2015-11-30 19:54:41 -06:00
Vincent 16303c1c1f Changes flag name from ABSTRACT to NODECONSTRUCT
Removes holo-tables and holo-windows since those typepaths are no longer needed.
Updates Z2 to reflect this.  Removes spurious tag tags in Z2.
2015-11-30 20:26:03 -05:00
Incoming 42da16a003 adds swankcookie's snowman stuff to the gifts that will spawn on christmas should the trees exist which hopefully they will! 2015-11-30 19:21:53 -05:00
KorPhaeron c29f2ef837 Internals start at 16 pressure 2015-11-30 18:12:32 -06:00
Vincent b31b5e3f77 Fix Conflicts:
code/game/machinery/doors/windowdoor.dm
2015-11-30 18:56:43 -05:00
Razharas 78c95ab035 Merge pull request #13317 from neersighted/airlock_electronics
NanoUI Airlock Electronics
2015-11-30 20:43:33 +03:00
duncathan salt ad410e39d8 Merge pull request #13296 from neersighted/nanoui_checks
Fix some NanoUI checks
2015-11-29 18:36:18 -06:00
Vincent 05ae680b06 Fixing conflicts:
code/game/machinery/computer/computer.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/objects/structures/window.dm
2015-11-29 19:02:30 -05:00
Bjorn Neergaard 06e5df9336 Fix NanoUI missing assignment; use two-line ifs 2015-11-29 18:20:10 -05:00
Razharas a2bcbf5db7 Merge pull request #13279 from tkdrg/PUTTING_YOUR_VARS_IN_A_POOL
Ports the /vg/ pooling resetVars by Clusterfack
2015-11-29 23:36:07 +03:00
Remie Richards edfb957bd2 Merge pull request #13088 from as334/master
Plasmamen fixes
2015-11-29 19:17:11 +00:00
as334 dc98e67f05 Just fuck my shit up fam 2015-11-29 13:48:58 -05:00
duncathan salt aa7df92150 Merge pull request #13282 from Anonus/fluxfix
Fixes flux and gravitational anomalies not shocking nondense mobs
2015-11-29 12:35:30 -06:00
duncathan salt 9e9ccf9474 Merge pull request #13268 from Anonus/teachingsofnarsie
Cult theme update
2015-11-29 12:23:07 -06:00
Nerd Lord fba1c1129a fine, fine fuck okay sure
don't sacrifice dogs, okay? nar-sie has standards, of a sort
2015-11-29 13:11:18 -05:00
Bjorn Neergaard f214e547cb NanoUI Airlock Electronics
Also reworks a lot of the AE code.
2015-11-29 11:32:56 -06:00
MrStonedOne 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
Jordie fd96c313a7 Merge pull request #13248 from bgobandit/dominatorfix
Fixes dominator error message issue.
2015-11-29 21:08:38 +11:00
Jordie e9ea0d8dc9 Merge pull request #13275 from swankcookie/snowman
Adds Snowman costume
2015-11-29 21:08:11 +11:00
Jordie aa672d3e95 Merge pull request #13230 from JJRcop/i12317
Fixes changeling hivemind download
2015-11-29 21:07:18 +11:00
Jordie 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
Jordie 38eddb1421 Merge pull request #13179 from AnturK/academy
Wizard Academy Away Update
2015-11-29 21:06:34 +11:00
Jordie da0c466f82 Merge pull request #13149 from Firecage/toolspeed
Adds toolspeed
2015-11-29 21:06:15 +11:00
Jordie 06134d5f19 Merge pull request #13104 from GunHog/OfTeleportsAndNames
Hand Tele now displays its destination.
2015-11-29 21:06:01 +11:00
Jordie 97a3b3f3c7 Merge pull request #13097 from RemieRichards/patch-2
Updates Holopad code to use AltClick
2015-11-29 21:05:50 +11:00
Jordie ee3e5c4d3f Merge pull request #13074 from Yolopanther12/lightReplacerUpgrade
Adds Light Replacer Refilling With Box of Lights
2015-11-29 21:04:43 +11:00
Razharas 4314b0924a Merge pull request #13203 from Incoming5643/g_absorbing_the_joke
Removes Accidental IC in OOC
2015-11-29 12:14:10 +03:00
as334 611fb49c1c Wake me up inside 2015-11-29 00:58:30 -05:00
duncathan salt a5dfafd0d4 Merge pull request #13197 from MrStonedOne/revert-12977-reverttimedinjectors
Revert "Properly reverts timed injectors"
2015-11-28 22:46:36 -06:00
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
Nerd Lord b926afc3ef Fixes rune code a little, the revival beam goes the right way now. 2015-11-28 21:24:17 -05:00
Bjorn Neergaard d400927522 Fix some NanoUI checks
Canisters require physical access and nothing else.
NanoUI checks Brain Damage by default.
2015-11-28 19:58:34 -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
AnturK 9a434b669c Academy Fixes 2015-11-28 23:17:57 +01:00
Nerd Lord 33e6fe073e Cross() isn't called anywhere even though it might be useful! workarounds! 2015-11-28 12:49:44 -05:00
Nerd Lord 98e3cdeabd Fixes flux and gravitational anomalies sometimes not shocking mobs. 2015-11-28 12:41:28 -05:00
AnturK b662b470a9 Enables ghost to go through ladders
Adds Cold snow turf
Adds Infinite Candles
2015-11-28 18:14:52 +01:00
AnturK b14e9133d2 Academy Update 2015-11-28 12:35:41 +01:00
AnturK 9fd9e5c21d Makes user explicit in spell code 2015-11-28 12:35:40 +01:00