Commit Graph

13853 Commits

Author SHA1 Message Date
octareenroon91 38b97120dd Enables design transfer to autolathe by disk.
You can now save a metal-and/or-glass-only design to disk and load it onto an autolathe.
2016-02-10 12:40:41 -06:00
tkdrg 554b163880 Merge pull request #15306 from MrStonedOne/patch-147
Removes the access restriction from wall mounted nano meds
2016-02-10 13:55:07 -03:00
KorPhaeron bbd20807b7 Indents with tabs instead of spaces 2016-02-10 10:38:51 -06:00
AnturK 559ab8fa6f Merge pull request #15354 from neersighted/call_me_cratezy
Allow horizontal mobs to fit into crates
2016-02-10 16:17:19 +01:00
Bjorn Neergaard e4f3045487 Add spacecat
Fixes a revert in my last crate PR, spacecat added to asteroid
secret room (previously included a cat critter crate)
2016-02-10 09:15:03 -06:00
Bjorn Neergaard a16f554c35 Allow horizontal mobs to fit into crates
Also make stuffing into crates/lockers a mild stun akin to tabling
2016-02-10 09:14:58 -06:00
Bjorn Neergaard 22119232ad Fix DNA runtime
When an admin clicks cancel on change species, a null species
it set. Check for this in the set_species proc

The following runtime has occured 34 time(s).
runtime error: Cannot create objects of type null.
proc name: set species (/mob/living/carbon/set_species)
  source file: dna.dm,180
  usr: Phoebe Lotsu (/mob/dead/observer)
  src: Swae Lee (/mob/living/carbon/human)
2016-02-10 07:23:00 -06:00
Bjorn Neergaard 85e80780ce Fix storage runtime
Mobs without clients can't see into storage! They have no screen!

The following runtime has occured 92 time(s).
runtime error: Cannot read null.screen
proc name: show to (/obj/item/weapon/storage/proc/show_to)
  source file: storage.dm,104
  usr: Leo Pfeifer (/mob/living/carbon/human)
  src: the backpack (/obj/item/weapon/storage/backpack)
2016-02-10 07:20:25 -06:00
KorPhaeron 3c2c923b22 Fixes scythe item_state 2016-02-10 05:06:18 -06:00
AnturK b2268b30ad Merge pull request #14851 from MrStonedOne/patch-130
[Ready]Tesla balance and code cleanup
2016-02-10 11:36:32 +01:00
duncathan salt 9a6300e2a2 Merge pull request #15173 from KorPhaeron/holy
Allows the chaplain to choose his holy weapon theme
2016-02-09 23:42:56 -06:00
KorPhaeron 91ecb5a603 Fix for the fix 2016-02-09 23:31:34 -06:00
KorPhaeron 2566e424b3 Fixes, special effects for whip and carp 2016-02-09 23:14:50 -06:00
Bjorn Neergaard 481bc67ae6 Fix objective runtime
When reading fromg gases you must assert_gas

The following runtime has occured 59 time(s).
runtime error: cannot read from list
proc name: check special completion (/datum/objective_item/steal/plasma/check_special_completion)
  source file: objective_items.dm,97
  usr: null
  src: 28 moles of plasma (full tank) (/datum/objective_item/steal/plasma)
2016-02-09 23:00:57 -06:00
Bjorn Neergaard 9fbdd7dc6b Fix sleeper runtime
Doesn't matter because the parent calls dropContents()

The following runtime has occured 128 time(s).
runtime error: Cannot read null.contents
proc name: Destroy (/obj/machinery/sleeper/Destroy)
  source file: Sleeper.dm,52
  usr: Daniel Young (/mob/living/carbon/human)
  src: the sleeper (/obj/machinery/sleeper)
2016-02-09 22:47:08 -06:00
tkdrg acb6a500cf Merge pull request #15330 from KorPhaeron/wall_animation
Fixes missing attack animation when attacking R-Walls
2016-02-10 01:21:56 -03:00
PKPenguin321 49066cdc72 removes EMPlight from EMP kit
separate commit because inbuilt editor cannot into editing two files in one PR
2016-02-09 16:50:17 -08:00
Leo 9ff6f0b0b2 Removes return 2016-02-09 19:54:46 -02:00
Lzimann 831d2e04cc Fix tabecrafting menu opening when you click the table
Also adds a cursor change when you drag the table to you. And fixes tablecrafting menu not opening if the table is empty.
2016-02-09 19:46:39 -02:00
Bjorn Neergaard 173387eefc Remove borg jetpack, give them ion thrusters instead
Also clean up jetpack human movement because wow that code was messy
Its still bad but its better (tm)
2016-02-09 14:53:37 -06:00
AnturK 03890d2ea4 Merge pull request #15250 from ChangelingRain/blobtooweak
Adds five new blob chemicals and some blob tweaks
2016-02-09 18:04:55 +01:00
Incoming 6ef82fd642 Merge branch 'master' of https://github.com/tgstation/-tg-station into animorphs_speedrun 2016-02-08 22:26:00 -05:00
tkdrg ba2e629525 Merge pull request #15286 from AnturK/bagofboom
Adds C4 bag to uplink
2016-02-08 21:39:31 -03:00
Bjorn Neergaard f97c8a00f2 Internals action button 2016-02-08 17:10:04 -06:00
Bjorn Neergaard eaa6bc7b18 Implement better jetpack action button 2016-02-08 17:09:12 -06:00
tkdrg e554077458 Merge pull request #15327 from phil235/VisionFixes2
Some vision fixes
2016-02-08 19:34:37 -03:00
KorPhaeron 9df93ced27 Attack animation for simple animal attacks 2016-02-08 13:58:53 -06:00
phil235 16a5441379 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionFixes2
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2016-02-08 19:35:01 +01:00
phil235 b9bba3a501 Fixes unconscious mob standing still when removed from cryo cell, closet, containers.
Fixes mobs inside cryo cells getting pipes overlay(ventcrawl). Ventcrawler can no longer move in or out of
the cryo cell, which fixes ventcrawler going into cryo cell and getting stuck in it.
Being inside a cryo cell now give you a nearsight overlay (same as closet).
Brains no longer get the red circles overlay when damaged.
MMI now properly updates its icon when the brain mob dies.
Fixes getting stuck with a grab inside you when grabbing someone buckled.
Silicon stunned, weakened and paralysis is now properly updated.
2016-02-08 19:22:45 +01:00
KorPhaeron d25e113ecc Removes unused defines 2016-02-08 11:15:45 -06:00
KorPhaeron c2b77be84b Better list/choosing of holy weapons 2016-02-08 11:12:33 -06:00
AnturK f6f7943189 Adds C4 bag to uplink 2016-02-08 16:10:34 +01:00
GunHog 0bab26452b Merge remote-tracking branch 'remotes/upstream/master' into The_Mech_Every_CMO_Will_Want
Conflicts:
	code/game/mecha/equipment/tools/medical_tools.dm
2016-02-08 08:50:44 -06:00
tkdrg 6e9441b81e Merge pull request #15269 from AnturK/fixerinio
Fixes crayon/spraycan buffer mode.
2016-02-08 11:42:46 -03:00
tkdrg 3bd79ccadb Merge pull request #15262 from neersighted/damnshuttle
Rework crates, supply packs, and supply orders
2016-02-08 11:36:26 -03:00
Bjorn Neergaard 39421efeb3 Address feedback 2016-02-08 07:22:18 -06:00
Bjorn Neergaard f19feb4505 Remove dupe file, remove colon cancer and add prespawned stacks 2016-02-08 01:16:30 -06:00
Bjorn Neergaard 209fa5ffe6 Add internals to critter crates; factor more crate code into closets 2016-02-08 01:01:49 -06:00
Kyle Spier-Swenson 35f07a7361 Removes the access restriction from wall mounted nano meds
This doesn't make sense to have, the full ones should, but not the smaller ones.
2016-02-07 21:19:31 -08:00
KorPhaeron aecf08655d Nerf LSG 2016-02-07 22:41:08 -06:00
MrStonedOne 60d068e6fa Merge remote-tracking branch 'upstream/master' into patch-130
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/objects/objs.dm
	code/modules/reagents/reagent_dispenser.dm
2016-02-07 17:41:42 -08:00
MrStonedOne eef4f4d534 Optimizes tesla_zap, adds fuel tank tesla_act, misc tesla changes 2016-02-07 17:34:52 -08:00
tkdrg 7dc0de7a87 Merge pull request #15239 from TrustyGun/janikeys
The janitor's belt can now hold his janicart keys.
2016-02-07 21:18:21 -03:00
phil235 83633edfed - I renamed some of the new adjust procs and create new ones for eye_blind,eye_blurry and eye_stat so they get three procs just like weakened/sleeping/etc.. (Sleeping, AdjustSleeping, SetSleeping)
- renamed the eye_stat var to eye_damage.
- mob/on_varedit() added. Manually var editing a mob's eye_blind var properly updates his vision.
- I removed update_vision_overlays(), we now just update the relevant fullscreens instead of all fullscreens whenever one needs to be updated.
- fixed climbing into mecha not giving you mecha sight.
- simplified and removed copypasta from update_tinttotal() (now update_tint() )
2016-02-07 18:50:18 +01:00
AnturK ed47afaa05 Fixes crayon/spraycan buffer mode. 2016-02-07 13:18:10 +01:00
Bjorn Neergaard 4ef2667ff2 Rewrite supply packs/cargo orders 2016-02-07 04:45:55 -06:00
Bjorn Neergaard ddab6823d3 Fix up crates
All shipable crates are proper children
All crates support a manifest
Crates rely on parent code shared with closets when possible
2016-02-07 01:20:37 -06:00
Bjorn Neergaard ede93b63a6 Put shuttles in their proper place, split out secure crates 2016-02-07 01:18:56 -06:00
Cheridan 1449640867 Merge pull request #15247 from ChangelingRain/revert-15182-complexanimals
Revert "Simple animal force threshold no longer converts damage to brute"
2016-02-06 20:32:21 -06:00
tkdrg 90b5a5bfa5 Merge pull request #15154 from AnturK/brig_timers
Brig door timer tgui
2016-02-06 23:13:13 -03:00