Commit Graph

22199 Commits

Author SHA1 Message Date
FalseIncarnate
b602e3d5e3 Botany Fixes and Telescopic Scythes
- Ports https://github.com/Baystation12/Baystation12/pull/9184 from
Baystation

- Prevents deconstruction of soil and invisible soil
- Fixes #1011

- Adds a verb to eject tanks from hydroponics trays if one is inserted
- Don't think anyone has actually done this, but it has been possible
for a LONG time and will be more useful once I get the atmos portion of
botany working

- Fixes grown items not leaving behind their trash
- Notably banana peels and corn cobs. Clowns and hillbillies rejoice!

- Adds 15% chance for a watermelon to leave behind a pack of it's seeds
when eaten.
- Slicing watermelon will not produce seeds ever

- Replaces the Janitorial ERT members' plant-b-gone sprays with new
Telescopic Scythes!
- Can be collapsed to fit on a belt or fit in pockets/bags
- While collapsed, it loses a large amount of it's damage, is not
considered sharp or as having an edge, and cannot cut vines like a
normal scythe. Extended ones are functionally identical to normal
scythes
- Extending and collapsing a telescopic scythe has some awesome sounds
from Freesound.org
2015-05-12 23:00:02 -04:00
ZomgPonies
288f593ca2 Merge pull request #1024 from tigercat2000/OtherSomeFixes
Fix: Space turf depressure, admin del is now admin qdel, event manager runtime
2015-05-12 22:49:46 -04:00
Tigercat2000
f85be9e742 Fix: Event manager list index out of bounds
This commit prevents a runtime of "list index out of bounds" with events
by adding a simple sanity checking system, so that the list checked always
has a valid check, regardless of if the event has a valid variable. NOTE:
May result in unintended behaviour if an event tries to complete with an
invalid severity level. It will always be set to moderate, as that is a
safe assumption for the code to make.
2015-05-12 18:33:24 -07:00
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
TheDZD
6bdb1af83d Merge pull request #1022 from ZomgPonies/gui
Allows GUI buttons for accessories
2015-05-12 20:11:41 -04:00
ZomgPonies
4c043396a9 Merge pull request #1023 from tigercat2000/Somebugs
Get_Area(), Event, and grab fixes
2015-05-12 20:11:32 -04:00
Tigercat2000
3a6ab84e83 Get_Area(), Event, and grab fixes
This commit fixes the following things:
 - Get_Area() now properly returns the area
 - Events will no longer runtime upon being manually triggered by an admin
 - The prison break event works again
 - Grabbing will no longer runtime (May result in people with pixel
   offsets from a grab being stuck, better than a runtime)
2015-05-12 17:04:28 -07:00
ZomgPonies
396dc7c00b Was missing an important bit 2015-05-12 20:04:18 -04:00
ZomgPonies
a26cda2fa1 Allows GUI buttons for accessories 2015-05-12 19:23:17 -04:00
TheDZD
3a8ec26aa2 Merge pull request #1020 from ZomgPonies/master
Mob login runtime fix
2015-05-12 18:47:40 -04:00
ZomgPonies
1dea1acbb9 Cleanup 2015-05-12 18:33:40 -04:00
ZomgPonies
825f4c1c06 Mob login runtime fix 2015-05-12 18:07:30 -04:00
ZomgPonies
59cef3fa73 Merge pull request #1013 from Fox-McCloud/infra-red
Infrared Beam Useability
2015-05-12 17:58:23 -04: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
ZomgPonies
c29d2f4dac Merge pull request #1008 from tigercat2000/VcrawlFixes
Generic ventcrawling + Bugfixes
2015-05-12 14:35:01 -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
ZomgPonies
2706d1e538 Merge pull request #1016 from Krausus/FabFix
Fixes mech and pod fabricators not synchronizing
2015-05-12 06:39:40 -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
Fox-McCloud
5fe4b0db02 Merge pull request #1015 from ZomgPonies/library
Library Fixes
2015-05-11 23:49:13 -04:00
ZomgPonies
6361dabca2 Merge pull request #1014 from tigercat2000/Lightinfixin
Prevent divide by 0 runtime, fix supply shuttle
2015-05-11 23:29:58 -04:00
ZomgPonies
0cf968785f Added rules to upload computer, better logging, cleaned out DB of non-fluff books 2015-05-11 23:28:32 -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
ZomgPonies
e8782f90bd Merge pull request #1003 from Fox-McCloud/sound-tweak
Black Powder Sound Tweak
2015-05-11 21:54:31 -04:00
Tigercat2000
27d56bdab1 Update gitignore and mapmerge for tgstyle maptree
This commit updates the .gitignore file to ignore the proper files with
the new tree system, and modifies the mapmerge files to the latest -tg-
files, as those are already compatible and written for the new tree
system.
2015-05-11 16:03:07 -07:00
Fox-McCloud
c21777b4de Infrared Beam Useability 2015-05-11 18:22:09 -04: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
Tigercat2000
7ca4eeb703 Fix headbutting and remove drawback 2015-05-11 14:43:45 -07:00
ZomgPonies
303a664f78 Merge pull request #1000 from Fox-McCloud/species-touchup
Species Touchups
2015-05-11 17:06:52 -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
Tigercat2000
9dff485066 Update map system to -tg- standards
This commit updates the map system to -tg- standards. All stations are
defined under _maps/, and all .dmm files go under _maps/map_files/.

Currently, only the NCS Cyberiad is setup under the system.

Misc changes:
 - World Status contains the map name
 - dm.sh script will allow automatic map changing between restarts.
 - _globalvars folder starting to take shape, not everything is migrated
   there yet.
2015-05-11 11:09:18 -07:00
Tigercat2000
fd4b35fced GAABS: Fix a few missing icons 2015-05-11 09:51:46 -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
ZomgPonies
298627ac7c Merge pull request #1009 from Krausus/Fixes-2015-05-11
Bunch o' Fixes
2015-05-11 09:59:51 -04:00
Tigercat2000
1266df1f3d Generic ventcrawling + Bugfixes
This commit makes the ventcrawling system operate independant of
ventcrawling verbs. Every type of /mob/living now has a ventcrawling
variable, which allows them to interact with the ventcrawling system if
set to 1 or 2. The AltClickOn() defines for each ventcrawling mob have
been removed, and replaced with a single AltClick() define on ventcrawl
machinery.
2015-05-11 06:28:44 -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
264244630c Fixes black powder decals not exploding away 2015-05-11 08:36:25 -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
Tigercat2000
a3a1236c23 CBGI: Comment out every controversial thing
This commit comments out all of the controversial code from the new grab
system. The code is being left non-hard-deleted as an example, the
framework would be a shame to kill.
2015-05-11 04:43:09 -07:00
Krausus
ae864b0a2e Fixes captain's medal of captaincy spawning wrong 2015-05-11 07:35:41 -04:00
Krausus
520699c4ae Fixes spawning as NPC/drone before game start 2015-05-11 07:16:34 -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