Commit Graph

9304 Commits

Author SHA1 Message Date
Tigercat2000
b192bfd34c Fix: Space turf depressure, admin del
This commit fixes some special cases where a certain series of events
could lead to a space turf being created which was not activated in LINDA,
therefore it would not drain atmos correctly.

Things changed:
 - ChangeTurf properly updates new space tiles
 - Admin delete calls changeturf instead of del'ing turfs to satisfy LINDA
 - Admin delete now uses qdel instead of del, because everything is being
   switched to qdel.
2015-05-12 18:15:55 -07:00
ZomgPonies
a1d2f1e5f4 Merge pull request #1012 from tigercat2000/SpaceCube
Slice up Cyberiad.dmm, Spacecube transitioning.
2015-05-12 17:58:12 -04:00
TheDZD
a30d5953dd Merge pull request #1017 from ZomgPonies/superfix
Couple of superhero fixes
2015-05-12 15:11:51 -04:00
ZomgPonies
bd71606cf6 Merge pull request #1010 from tigercat2000/GAAB
Generic Action/Action Button System
2015-05-12 14:35:36 -04:00
Tigercat2000
7d103f5bd5 Add light color defs for more things
This commit adds custom color definitions to almost every computer that
did not already have them. It also causes cigarretes to very dimly glow.

Also contains custom colors for candles, flashlights, and the mentioned
cigarretes.

Oh, and beepsky flashes red and blue now while in hunt mode. FTW
2015-05-12 05:27:28 -07:00
ZomgPonies
2a0dcedd64 Couple of superhero fixes 2015-05-12 08:10:04 -04:00
Krausus
159a12bc64 Fixes mech and pod fabricators
I have no idea how this code ever worked in the past.
2015-05-12 03:37:37 -04:00
Tigercat2000
741da037fb Prevent divide by 0 runtime, fix supply shuttle
This commit adds a small sanity check to the falloff calculations of
lights, to prevent them from dividing by 0. This may cause undiscovered
strangeness, but strangeness is better than filling the runtime log.

This commit also fixes the supply shuttle, which was not spawning any
ordered items. It did this because it had a very basic contents.len check
which the lighting overlays triggered. The sanity check to not spawn stuff
on top of other stuff is now a for(atom) loop on the turfs, which has
snowflake checks for lights and lighting overlays.
2015-05-11 19:37:15 -07:00
Tigercat2000
e1fad29990 Merge remote-tracking branch 'upstream/master' into SpaceCube
Conflicts:
	maps/cyberiad.dmm
2015-05-11 14:55:01 -07:00
ZomgPonies
884fb4e4ca Merge pull request #981 from tigercat2000/ContextBasedGrab
Context-Based: Grab Intent (Bayport)
2015-05-11 17:44:33 -04:00
ZomgPonies
1b9cd2dfe4 Merge pull request #999 from Fox-McCloud/hiding
Potted Plant Hiding
2015-05-11 17:06:40 -04:00
ZomgPonies
f22ae3acbe Merge pull request #998 from tigercat2000/LightShit
Baystation12's Lighting Overhaul
2015-05-11 17:06:30 -04:00
Tigercat2000
d98bf2d958 Spacecube transitioning
This commit adds the spacecube system from -tg-. The spacecube system
allows for predicatably random space layouts- it is randomized every
round, but the transitions stay consistant for that round, therefore
making it possible to 'map' space, or explore in teams.
2015-05-11 12:43:10 -07:00
AnturK
568d289a67 Generic Action\Action Button System
This commit ports the GAABS from -tg-station13. The GAABS allows for
generic, movable, hud elements for spells, powers, and items.
2015-05-11 09:32:08 -07:00
Krausus
035b873c0e Fixes missing alien-on-space pod attack cooldown 2015-05-11 09:23:50 -04:00
Krausus
9d712fe623 Fixes pill bottles not grouping their contents 2015-05-11 09:11:11 -04:00
Krausus
65ce3e4c20 Fixes numbered contents grouping different things
Also fixes a runtime from the black powder fix. Whoops!
2015-05-11 08:53:14 -04:00
Krausus
c4d59070f6 Fixes camera upgrades not working properly
Important updates were being done in the malf AI's Upgrade Camera proc,
instead of in the actual upgrade procs
2015-05-11 08:17:08 -04:00
Krausus
ae864b0a2e Fixes captain's medal of captaincy spawning wrong 2015-05-11 07:35:41 -04:00
Krausus
e54c4d07e5 Fixes setting airlock electronics for engieborgs 2015-05-11 07:00:10 -04:00
Krausus
9978831f0e Fixes AIs tracking people who show cameras papers 2015-05-11 06:51:07 -04:00
Krausus
64f39bb871 Fixes AIs and ghosts not being able to follow bots
This probably touches more files than it really should, but I can't
think of a better way to do it that isn't overhauling the saycode.
2015-05-11 06:38:14 -04:00
Tigercat2000
5ff292fe47 Flashlight icon fix
I left out an icon-updating line. Whoopsies.
2015-05-10 20:41:46 -07:00
Tigercat2000
fd799d6844 Starlight
This commit ports baystation12's implementation of starlight, modified to
rely on the master-controller due to differences between us, -tg-, and
bay12. Starlight allows space tiles to give off light, the amount of light
can be configured in config.txt.
2015-05-10 18:31:21 -07:00
ZomgPonies
44cba43cbc Merge pull request #986 from Robertha89/patch-4
Updating Resource to /tg/ standars along with factory
2015-05-10 19:59:10 -04:00
Tigercat2000
c2038640f7 Lighting Overhaul Map stuff
This commit fixes up the map to account for the new shuttle lighting
system brought by the lighting overhaul.

Things changed:
 - Shuttles now all have lightbulbs in them
 - Syndicate Mothership now uses lighting as well, for a dark-forest look.
2015-05-10 16:58:41 -07:00
ZomgPonies
cc679371c3 Merge pull request #985 from tigercat2000/WeaponCleanup
Cleanup code/defines/ folder.
2015-05-10 18:39:00 -04:00
ZomgPonies
6aee3366ff Merge pull request #984 from tigercat2000/Pfixes
Pool Controller update: Hippie Edition
2015-05-10 17:45:56 -04:00
Tigercat2000
82d615f5b3 Merge remote-tracking branch 'upstream/master' into ContextBasedGrab
Conflicts:
	code/game/atoms.dm
2015-05-10 14:28:03 -07:00
Tigercat2000
40bd004923 Merge remote-tracking branch 'upstream/master' into WeaponCleanup
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/hydroponics/trays/tray_tools.dm
2015-05-10 14:15:51 -07:00
Tigercat2000
625dbb5295 Merge remote-tracking branch 'upstream/master' into LightShit
Conflicts:
	code/modules/hydroponics/trays/tray.dm
	code/modules/hydroponics/vines.dm
2015-05-10 13:56:28 -07:00
ZomgPonies
6610e0965e Merge pull request #983 from tigercat2000/water_act
Water_act system - for all your watery needs
2015-05-10 16:14:55 -04:00
ZomgPonies
45d433c50c Merge pull request #982 from tigercat2000/anothergibberthing
Autogibber, Gibber patches
2015-05-10 16:07:21 -04:00
ZomgPonies
23b2fac794 Merge pull request #980 from FalseIncarnate/master
Botany / Xenobotany Update [Feature][Sprites]
2015-05-10 16:05:57 -04:00
Tigercat2000
e1249fc640 Lighting overhaul.
This commit overhauls the lighting system to Bay12 standards. It is better
in pretty much every way.
2015-05-10 12:03:27 -07:00
Fox-McCloud
428dde8047 Potted Plant Hiding 2015-05-10 14:41:06 -04:00
Tigercat2000
b7b13f15a4 Merge remote-tracking branch 'upstream/master' into water_act
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
2015-05-10 05:41:52 -07:00
Tigercat2000
27442f9539 Water_act: Wetlevel for carbon mobs
All carbon mobs have a new variable called wetness, which is increased
upon water_act's that have a volume over 10, and is decreased every 22~
cycles of mob_master.

This variable currently does absolutely nothing but change their examine
text.
2015-05-10 05:39:26 -07:00
ZomgPonies
533841c0a5 Fixed mobs not taking damage from explosions 2015-05-10 00:19:28 -04:00
Fox-McCloud
0b66bf725f Merge pull request #979 from ZomgPonies/explosion
Ports VG's DeityLink's new explosion method
2015-05-09 23:42:02 -04:00
Fox-McCloud
dbaf893fe6 Merge pull request #971 from Krausus/QuickDumping
Improved Dumping for Containers
2015-05-09 20:33:06 -04:00
Robertha89
4366f5f819 Updating Resource to /tg/ standars along with factory
title, makes resource nodes far better. should pick up the drag that is costing resources to send blob to corpse.
2015-05-10 02:24:12 +02:00
Tigercat2000
595f24bd1b Cleanup /defines/ folder.
This commit removes code/defines/obj.dm and code/defines/obj/weapon.dm.
These files were only kept for legacy compatibility and do not fit into
the tree system at all. It doesn't even make sense since the base defines
are all that were in these, the actual code for the items was in the right
file.

Any new ports that use this file on a different codebase should be sorted
into the tree system anyways, new files if necessary. A giant defines
file is just wasting space and searching effort.
2015-05-09 16:06:59 -07:00
ZomgPonies
99a18df13b Merge pull request #976 from Fox-McCloud/cryox
[Goonchem] Cryox/Clonex Change
2015-05-09 18:34:21 -04:00
Tigercat2000
303aab7726 Pool Controller update: Hippie Edition
This commit updates the pool controller with some of the fixes that
HippieStation/Atlas added.

Things changed:
 - People will now drown in the pool if they are resting.
  - There are a few conditions.
  - They must not be wearing internals.
  - They must not be a skrell.
  - They must be a species that breathes
  - They must not have the NO_BREATHE power
 - AI's can no longer save people from burning in the pool with their
   magical field
  - Yes this was a thing, it would stop looking for mobs if it found an
     AI eye
2015-05-09 14:23:56 -07:00
Tigercat2000
597b15b850 Gibber: More logging, Autogibber fix
This commit adds the user name and ckey (where applicable) to the gibber
victim list.

victims = /list (1)
 - [12:27:52] unknown () killed by The unknown (tigercat2000) = null

victims = /list (1)
 - [12:26:56] Shadow Larkens (tigercat2000) killed by Autogibbing = null

This commit also fixes admin-vareditting the autogibber direction, it will
actually update it's linked turf now.
2015-05-09 12:28:54 -07:00
Tigercat2000
5549925516 Autogibber + Minor patches
This replaces the old autogibber with a spawnable version that is actually
an automatic gibber. This also fixes a few minor issues I did not notice
before with the gibber code. Namely, overlays getting messed up.

The gibber will now spit out things inside of it 1 by 1 instead of all at
once.
2015-05-09 12:07:05 -07:00
Tigercat2000
e33e658178 Water_act system - for all your watery needs
This is the first commit of the Water_act system for monkey cubes,
showers, and mobs. The idea of the system is to outsource the effects of
water to the object/mob being affected instead of a bunch of snowflake
code.
2015-05-09 05:43:47 -07:00
Krausus
6ef0c00921 Adds missing canmove check 2015-05-09 07:41:21 -04:00
FalseIncarnate
db9d9fc647 Botany / Xenobotany Update
Largely a port of https://github.com/Baystation12/Baystation12/pull/8038
(Credit to Zuhayr for his hard work on botany)

Breakdown of the port:
- Plant traits have been expanded drastically
- You want a bio-luminescent tomato that explodes into a cloud of acid
when thrown or stepped on? Or maybe a corn vine that entangles people
and injects them with mannitol and it's harvests that can be used as a
battery? Totally possible.
- Adds new random seeds! Replaces the egg-plant seed in the exotic seeds
crate from cargo with 2 of these.
- Literally random, they have randomly generated stats, chemicals, and
traits. Great for researching, and/or wasting cargo's supply points.
- Plant analyzers can now print off the last scan they recorded, meaning
you can distribute copies of the report to validate your claims of
having the dankest weed on station.
- Potatoes, carrots, watermelons, soybeans, and pumpkins can all be
sliced/diced/carved with ANY sharp object, such as knives, hatchets,
glass shards, and e-swords.
- This should give the chef a bit more room to make it look like he
actually is doing the work by slicing up fries by hand. The processor
still also works.
- New reagent: Wood Pulp
- Currently has no use in recipes, but any plant with this reagent in it
can be chopped into planks with a hatchet. Did someone order some
Ambrosia Deus planks?
- Also, vines with woodpulp are dense. You have been warned.

Now onto the stuff I did in addition to the stuff from Bay.
- Fixed typos where plasma was mistakenly called "phoron" in the port.
(Sorry bay)
- Replaced bay's botany mutation chances with our tiered mutation
system.
- Re-re-added tobacco, space tobacco, tea aspera, tea astra, coffee
arabica, and coffee robusta.
- Re-enabled the rolling of joints
- Made it possible to hand-roll cigarettes from tobacco / space tobacco.
(A requested / promised addition)
- Just like with joints, it will inherit any chems in the tobacco, has
the same reagent capacity as a joint, but looks and smokes like a cig
(lasts as long as the cigarettes) with a different name/description to
differentiate it from pre-made cigs.
- Corn can now be juiced in the grinder, in addition to grinding it.
Grinding corn will result in it's contained reagents (like corn starch),
while juicing corn will result in corn oil.
- Re-added the additional plant analyzer information when scanning trays
(displays age, weed level, etc)

Also cleaned up the recipes_microwave.dm file, removing the commented
out recipes that were distributed to the other machines during the
Kitchen Overhaul. Shortens the file a bit and makes it more readable.

I probably forgot stuff, so I will add things as I remember them / they
get pointed out.
2015-05-09 06:00:24 -04:00