Commit Graph

228 Commits

Author SHA1 Message Date
ikarrus
b385ed83b5 -Added checks to prevent the nuke disk from leaving z1
-If the disk is deleted while it's inside a nuke, the nuke will lock itself

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/turfs/space/space.dm
2014-05-20 21:32:37 -04:00
ikarrus
c139fa22a1 Objects being pulled will transition with mobs changing Z-levels via space 2014-05-20 21:25:01 -04:00
ZomgPonies
48f00ee263 Revert "Thermite Effectiveness Scaling with Volume"
This reverts commit 9a66fd7edd.

Conflicts:
	code/game/turfs/simulated/walls.dm
2014-05-07 19:54:01 -04:00
ikarrus
0b6341746b Thermiting walls leave admin prints 2014-05-04 22:38:24 -04:00
ikarrus
ce6eff3173 Added a sound effect to igniting thermite so it's not a silent stealthy move. 2014-05-04 22:38:11 -04:00
ikarrus
9a66fd7edd Thermite Effectiveness Scaling with Volume
-The more thermite is applied to a wall, the faster it will burn
-Scales between approx 10-25 seconds
-Rwalls have a higher minimum threshold and burn time
-Applying thermite to a wall now leaves a visible stain on the wall

Conflicts:
	code/game/turfs/simulated/walls.dm
	icons/effects/effects.dmi
2014-05-04 22:37:44 -04:00
Mloc-Argent
a5b3e3d567 turfs: fix some playsound ERRORs on areas
Turf (de)construction playsound()s were using src.loc, instead of src

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/turfs/simulated.dm
	code/game/turfs/simulated/floor.dm
2014-04-28 18:57:59 -04:00
alex-gh
521ad31671 Revert the new lighting system. 2014-04-07 23:51:35 +02:00
d3athrow
68012f5017 Fixed a gamebreaking bug
Conflicts:
	code/game/turfs/turf.dm
	code/modules/mob/living/carbon/human/life.dm
	maps/tgstation.2.1.0.0.1.dmm
2014-03-22 06:22:55 -04:00
Aryn
1712fc6a42 ChangeTurf()... We meet again... 2014-02-28 17:49:25 -05:00
Aryn
52e2a3d1c6 Lighting seems to be working now. 2014-02-28 17:48:55 -05:00
Aryn
5b2f811b71 Lighting system is too buggy to continue until I know wtf is going on
Conflicts:
	baystation12.dme
	code/game/turfs/turf.dm
2014-02-28 17:47:50 -05:00
ZomgPonies
1358b11e46 ZAS overhaul 2014-02-22 23:10:37 -05:00
ZomgPonies
1ab8df4b13 Garbage collection fixes 2014-02-19 20:24:31 -05:00
Ergovisavi
7ad68dd693 Replaced wall_smash in simple_animal with environment_smash, because before, you either tables AND walls, or nothing. If set to 1, smash crate/locker/rack/table, 2 for wallsmash, 3 for rwall smash
Hostile mobs with environment smash will also unbuckle themselves by destroying whatever they're buckled to when angered.

Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/game/objects/structures/tables_racks.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/simple_animal/hostile/hostile.dm
2014-01-23 23:31:36 -05:00
Ergovisavi
7bd3df0b3b More hostile mob work with behavior vars, getting rid of idle_env_destroyer nobody uses it, other tweaks
Conflicts:
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
2014-01-22 16:45:20 -05:00
Ergovisavi
78bea65a44 Mining Mobs - More mob behavior overhaul, kinetic gun tweaks, etc
Conflicts:
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/projectiles/ammunition/energy.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/special.dm
	icons/mob/animal.dmi
	icons/obj/projectiles.dmi
2014-01-22 16:39:54 -05:00
Rob Nelson
22a2df1115 Standardize HULK.
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/items/weapons/swords_axes_etc.dm
2014-01-21 22:45:40 -05:00
ZomgPonies
cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
ZomgPonies
5ab05ae5ee Compile fix 2014-01-14 00:42:13 -05:00
Rob Nelson
319ae54216 Make some adjustments to catwalks. Fixes #402, #404.
Conflicts:
	code/game/turfs/simulated/floor_types.dm
2014-01-14 00:40:30 -05:00
Rob Nelson
55e918cc6a Wire hacking recode from /tg/.
Conflicts:
	baystation12.dme
	code/__HELPERS/mobs.dm
	code/defines/obj/weapon.dm
	code/game/machinery/alarm.dm
	code/game/machinery/doors/airlock.dm
	code/game/machinery/machinery.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/paicard.dm
	code/game/objects/items/weapons/explosives.dm
	code/global.dm
	code/modules/assembly/signaler.dm
	code/modules/mob/living/silicon/mommi/life.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/wires.dm
2014-01-12 22:37:55 -05:00
Rob Nelson
8a6ea1d5c9 Fix multiple bugs with catwalks.
* Fixes catwalks not having space underneath them
* Fixes not being able to build catwalks
* Catwalks destructible with screwdriver
* Catwalks autoupdate icons with neighbors

Conflicts:
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	html/changelog.html
2014-01-11 20:43:31 -05:00
ZomgPonies
a61c82e3fb Updated explosion stuff. Less hull breaches. 2014-01-11 02:25:45 -05:00
ZomgPonies
4b532372d7 Extra var 2014-01-09 21:01:44 -05:00
SkyMarshal
e4fdc17405 Some turf cleanup and the like. Trace gases are now properly handled by ZAS on world load.
Fixes #2485

Conflicts:
	code/game/turfs/simulated/floor_types.dm
2014-01-09 20:59:31 -05:00
SkyMarshal
e2bbbb7e39 Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.
Conflicts:
	code/modules/mining/mine_turfs.dm
2014-01-09 20:56:38 -05:00
ZomgPonies
bbc0fb56a4 Catwalks redux first pass 2014-01-03 23:28:24 -05:00
ZomgPonies
311c4095e2 Merge pull request #106 from iamgoofballsecondfork/gokutonium
Adds Catwalks.
2014-01-03 19:23:09 -08:00
Iamgoofball
27a8669acf Adds Catwalks. 2014-01-03 19:08:28 -08:00
ZomgPonies
b2ee79eeeb Slime people fixes 2014-01-03 20:05:44 -05:00
ZomgPonies
abbf3586b2 Fix Dirt Levels 2014-01-01 16:12:24 -05:00
ZomgPonies
b5d363e9bd Fixes a bunch of sound runtimes 2013-12-31 19:08:36 -05:00
ZomgPonies
e29afdaf2b Dirt overlay fixes 2013-12-17 07:25:42 -05:00
ZomgPonies
33ef68faad Better dirty floors 2013-12-16 03:23:12 -05:00
ZomgPonies
227f4a1bc0 I guess slime people are now live. 2013-11-24 09:48:38 -05:00
ZomgPonies
3a37e74048 Moar turf optimizations! FIXED EDITION 2013-11-23 12:17:07 -05:00
ZomgPonies
fc29095086 Revert "More turf optimizations!"
This reverts commit 70a9bdd3c5.
2013-11-23 12:01:51 -05:00
ZomgPonies
887e172a26 More asteroid unsim fixes 2013-11-23 06:55:46 -05:00
ZomgPonies
70a9bdd3c5 More turf optimizations! 2013-11-23 06:21:38 -05:00
ZomgPonies
e837130d9e Tuning 2013-11-22 13:02:03 -05:00
ZomgPonies
71ef471186 Well-used corridors become dirty with time 2013-11-21 21:41:32 -05:00
ZomgPonies
859ed8bf38 Clown Planet V2 2013-11-20 21:47:00 -05:00
ZomgPonies
2c0614d3af Replaces HasEntered() with Crossed() and reduces redundant checks on turf/Enter() 2013-10-28 06:45:15 -04:00
ZomgPonies
42b3335e5c Added jackboot sounds 2013-10-22 16:06:54 -04:00
ZomgPonies
0d42f95633 Fixes 2013-10-22 03:41:32 -04:00
ZomgPonies
cc496f88ce Atmos changes 2013-10-15 16:27:30 -04:00
ZomgPonies
5daf979b72 Pretty much all new click code 2013-10-12 14:44:36 -04:00
ZomgPonies
77567ba6cd Fixed air alarms & problematic N2O tank 2013-10-05 03:23:50 -04:00
ZomgPonies
aa79d1323b Added Vox and Kidan as unlockable Karma species 2013-10-04 02:57:42 -04:00