Commit Graph

17074 Commits

Author SHA1 Message Date
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
Ccomp5950 13a72f4a04 Crash fix attempt: Moving NanoUI resource file sending away from client/New()
it's going in mob/Login() instead.

Conflicts:
	code/modules/client/client procs.dm
	code/modules/mob/login.dm
2014-04-28 18:51:57 -04:00
RavingManiac 9bfd6f56ba Inflatable barrier boxes readded to engineering. Inflatable barriers can no longer be deflated by ghosts.
Conflicts:
	maps/tgstation2.dmm
2014-04-28 18:47:15 -04:00
ZomgPonies 01bbf00d2c Ability to upgrade powercells in energy weapons 2014-04-27 18:20:59 -04:00
ZomgPonies 1ebe9f34e9 Solar fixes 2014-04-27 17:39:56 -04:00
ZomgPonies 25084e1c33 Fixed missing areas for a proper prisonbreak 2014-04-26 18:32:46 -04:00
Giacomand 9d27cb5d76 Fixes a typo. 2014-04-26 17:28:10 -04:00
Giacomand 0232d945f4 Fixes transit tubes being stuck, it uses process() instead of a spawn'd loop.
Segmented the transit tube code into its own folder and code files, for each part of the tube.

Conflicts:
	baystation12.dme
	code/game/objects/structures/transit_tubes.dm
2014-04-26 17:27:43 -04:00
alex-gh 02aab3f779 Temporary revert for the new say code. 2014-04-24 10:28:52 +02:00
alex-gh 780ab3a32b Added a random delay to mass hallucination announcement, made hallucinations more severe 2014-04-23 18:30:19 +02:00
alex-gh a1e4591c5a Moved more destructive events later in the round 2014-04-23 18:26:45 +02:00
d3athrow 528ffcef1d Fixes a nano runtime when the oldMob is null during a user_transfer
Conflicts:
	code/modules/nano/nanomanager.dm
2014-04-23 11:48:14 -04:00
d3athrow bd0354cf7d Fix not being able to open the playerpanel of aliens due to a runtime. 2014-04-23 11:45:07 -04:00
ZomgPonies c5c2f52500 Fixed some bugged intents 2014-04-22 11:02:11 -04:00
ZomgPonies 1cdbe818ad tg's solars update 2014-04-22 09:46:36 -04:00
RavingManiac 850236a137 Shuttle windows replaced with reskinned reinforced glass windows. Number of doors into cockpit reduced to 1.
Fitness room rearranged to make more sense, with glass around pool.

Conflicts:
	maps/tgstation2.dmm
2014-04-22 09:24:46 -04:00
ZomgPonies 1a4ab5c799 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-04-20 10:10:22 -04:00
Ccomp5950 2d34d142a7 Say code fixes.
Lobby players won't hear stuffs
Universal hearing with animals won't be a thing.
Players won't hear stuff if they are sleeping, though somethings might slip through...

Conflicts:
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/modules/mob/new_player/new_player.dm
2014-04-20 09:30:18 -04:00
alex-gh 71151c0c57 Merge pull request #183 from alex-gh/event_area_rework
Events can now strike all areas instead of few select ones
2014-04-20 14:07:27 +02:00
alex-gh 8a9130026a Events can now strike all areas instead of few select ones 2014-04-20 14:04:15 +02:00
Mike bf98751d8b Clean up check for item being equipped
Moved some common code to item.dm. Someone should probably take a look
at get_equipped_items() in inventory.dm sometime in the future.
2014-04-20 03:50:23 -04:00
Mike 6d8d253ad7 Prevent vox boots from enabling in player's hand
Vox players can't "dig their claws into the flooring" when holding the
boots in their hand. When enabled, the boots can't be taken off until
disabled.
2014-04-20 03:50:11 -04:00
Mike 9dbf6be429 Removed the now-redundant verb
Less clutter for the object panel.

Conflicts:
	code/modules/clothing/shoes/magboots.dm
2014-04-20 03:49:55 -04:00
Mike 79d530def8 Enabled action icon for magboots
Conflicts:
	code/modules/clothing/shoes/magboots.dm
2014-04-20 03:48:01 -04:00
ESwordTheCat cd8bc1d878 Let depend on use_power var if we need to know the area. 2014-04-20 03:45:56 -04:00
Mloc-Argent e179e95dea atmos: remove a few force-deletes in merge code
Removes del(giver) from pipeline/merge(), turf/assume_air() and
atom/assume_air().
Thanks to valzargaming on reddit/github for pointing it out.
fixes #4717

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-04-20 03:37:46 -04:00
ESwordTheCat 16d5d18e7c Revert from area to text.
Conflicts:
	code/modules/power/power.dm
2014-04-20 03:37:00 -04:00
ESwordTheCat 84c296e741 Use the experimental getArea.
Conflicts:
	code/modules/power/power.dm
2014-04-20 03:28:46 -04:00
ESwordTheCat 51c8b9306d Declare myArea as an area. 2014-04-20 03:27:41 -04:00
ESwordTheCat 30ad27872f experimental getArea() proc. 2014-04-20 03:27:31 -04:00
ESwordTheCat 44ee513752 Because it use less instructions. 2014-04-20 03:27:17 -04:00
ESwordTheCat b332bc7dec Don't use get_area proc, introduce myArea variable.
Conflicts:
	code/modules/power/power.dm
2014-04-20 03:26:59 -04:00
ZomgPonies f9a773c84d Fix smoke 2014-04-20 02:34:40 -04:00
Necaladun 961bd99d2c Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-04-20 12:28:34 +09:30
Necaladun 9dff158fa2 Access changes
EVA access to heads. Brig/sec doors to customs.
2014-04-20 12:28:10 +09:30
Necaladun 5e812fb047 Club needs power
Club now needs power, APC is added
2014-04-20 12:27:53 +09:30
ZomgPonies 4b1619ddf5 Fix for binary speak? 2014-04-19 22:14:08 -04:00
Rob Nelson 56d8ce28c8 Part 1 of economy rework: Spacecash refactor - See commit for full changelog.
* Implements stacking and stack overlays
 * Simplified tiers of cash (1,10,100,500,1000, may remove 500)
 * Simplified API (dispense_cash, count_cash)

Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/admin/verbs/debug.dm
	code/modules/economy/ATM.dm
2014-04-19 20:47:41 -04:00
Rob Nelson b34d436756 Fix jukebox formatting 2014-04-19 20:37:01 -04:00
ESwordTheCat cb2ecbaa30 Reduce use of named arguments. 2014-04-19 20:36:47 -04:00
Rob Nelson 0221e5bdff Fix jukebox after hammering it :V 2014-04-19 20:33:35 -04:00
Rob Nelson 2389e9a778 Fix a bunch of jukebox issues, clean up UI a bit, add feedback, allow slapping it to reset if broken. 2014-04-19 20:33:22 -04:00
Duny 235d32999a Fix borgs not choosing an appareance
Locks down cyborgs after they choose a module until they choose an
appareance, to prevent standard borgs with security modules and such
running around.

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
2014-04-19 20:32:58 -04:00
Duny 0acb55c296 Fixed Incendiary Mithocondria, nerfed Cryokinesis a bit
Incendiary Mithocondria now sets yourself on fire as intended instead of
doing nothing.
Cryokinesis now freezes you for a bit more than ten seconds and deals 20
damage instantly then around ten damage instead of the 30 seconds of
freeze and more than 40 damage over the duration it did before.

Conflicts:
	code/game/dna/genes/goon_powers.dm
2014-04-19 20:29:34 -04:00
ESwordTheCat 37bcc29ca5 Opacity is more realistic than density. 2014-04-19 20:21:59 -04:00
Rob Nelson 6d7040e735 A few remaining jukebox bugs
Conflicts:
	code/modules/media/mediamanager.dm
2014-04-19 20:21:44 -04:00
Rob Nelson ac5fcf31a5 Autoplay after power restoration when emagged. 2014-04-19 20:03:33 -04:00
ESwordTheCat 6e7ec7ff21 Turn off debugging. 2014-04-19 20:03:15 -04:00
ESwordTheCat 65d24a2b32 Initialization fix. 2014-04-19 20:03:03 -04:00
Rob Nelson cf4b9f5e42 Emaggable jukebox. 2014-04-19 20:02:42 -04:00