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
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
ZomgPonies
2a0dcedd64
Couple of superhero fixes
2015-05-12 08:10:04 -04:00
Fox-McCloud
5fe4b0db02
Merge pull request #1015 from ZomgPonies/library
...
Library Fixes
2015-05-11 23:49:13 -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
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
f22ae3acbe
Merge pull request #998 from tigercat2000/LightShit
...
Baystation12's Lighting Overhaul
2015-05-11 17:06:30 -04: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
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
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
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
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
520699c4ae
Fixes spawning as NPC/drone before game start
2015-05-11 07:16:34 -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
Fox-McCloud
e2ee01b621
Black Powder Sound Tweak
2015-05-10 21:51:50 -04:00
ZomgPonies
6fe5db524a
Fixes reflecting projectiles
2015-05-10 20:10:27 -04:00
ZomgPonies
1ecdb14fa3
Merge pull request #987 from Fox-McCloud/unathi-tail
...
Adds in Unathi Tail Wagging
2015-05-10 19:59:41 -04:00
Fox-McCloud
1325bd562e
tweak 2.0
2015-05-10 17:42:25 -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
e7ec8a7e2d
Compile-fix
2015-05-10 14:21:44 -07:00
Fox-McCloud
1e32bd1205
Species Touchups
2015-05-10 17:19:22 -04: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
92c5d0139a
Fix hydroponics to use the right light system
...
This commit updates hydroponics to the new light system, so it stops
compile-error'ing
2015-05-10 14:09:57 -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
68d4b98af4
Merge pull request #996 from Robertha89/patch-5
...
Adds service radio to ai
2015-05-10 16:15:58 -04:00
ZomgPonies
8a3c2ef2fe
Merge pull request #993 from Fox-McCloud/ooooops
...
Health Analyzer Name Fix
2015-05-10 16:15:41 -04: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
Tigercat2000
4642f76d33
Colored Fire
...
This commit adds a colored fire system based on baystation12's system.
2015-05-10 13:12:22 -07:00
ZomgPonies
23b2fac794
Merge pull request #980 from FalseIncarnate/master
...
Botany / Xenobotany Update [Feature][Sprites]
2015-05-10 16:05:57 -04:00
Tigercat2000
a46518f120
Increase very low probability to escape grabs
...
This commit raises two probability values in resist code, namely for
resisting out of grabs. The previous probabilities were 25 and 5, they are
now 60 and 15.
2015-05-10 12:09:58 -07: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
Robertha89
6cda382c5e
Adds service radio to ai
...
Fixes an oversight.
2015-05-10 17:10:17 +02:00
Tigercat2000
0e948ffeec
Remove Jointbreaking, Joint fracturing, and Knifing
...
This commit removes Jointbreaking, Joint fracturing, and Knifing from the
grab system due to near-universal dislike of the features.
2015-05-10 06:46:58 -07:00
