Commit Graph

9304 Commits

Author SHA1 Message Date
Ravensdale 6a359474cc Update code/game/objects/explosion.dm
Removing a repeat if statement
2012-12-22 14:58:01 -08:00
Ravensdale 9d9061180d Port of z-level explosion sound effect from pre-merge. Tested and confirmed working with c-4, welding tanks, meteors and roro explosions, probably more! 2012-12-22 14:46:44 -08:00
Hawk-v3 70b40dfc6b Merge pull request #2096 from comma/crates
Crates
2012-12-22 08:29:21 -08:00
giacomand@gmail.com da52e0d847 -Didn't realize atmo_control.dm used a different attackby for a reason. Reverted the changes.
-Bit more cleaning.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5371 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-21 20:55:49 +00:00
giacomand@gmail.com 76a6ef2252 -Cleaned up computers. Fixes Issue 1195
-Made computers use idle_power_usage and active_power_usage that it used from the MC.

I'm sure something is likely to break because I removed a lot of snowflake code. I tried to test all the computers with what I can but if you find something odd then please tell me.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5369 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-21 20:38:36 +00:00
aranclanos@hotmail.com ac116cb88d . Fixed the runtime of the holodeck
If an object gets deleted, it won't be removed from the holodeck list of objects. So the stupid proc will try to do stuff with null. Bad proc.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5368 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-21 18:34:20 +00:00
d_h2005@yahoo.com 12e8a32eb2 Tiny adjustment for Ikarrus: The alternate HoS jumpsuit is not a subtype of the normal, and therefore counts towards fulfillment of the Steal objective.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5365 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-21 04:28:11 +00:00
Chinsky 581f2c4db5 Merge branch 'master' into crates 2012-12-21 01:03:20 +04:00
cib 1bdfe2e442 Traitor objectives are now checked regularly.
This doesn't mean the game can end early, it just means certain traitor objectives get a chance to process themselves before the round ended. For instance, the brig objective can now check periodically how long someone's been in the brig.
2012-12-19 22:27:15 +01:00
cib 1d0147c396 Merge branch 'master' of github.com:Baystation12/Baystation12 into feature 2012-12-19 19:40:28 +01:00
d_h2005@yahoo.com 68969baa5c Fixes issue 1106 - Splits the chicken suit into suit and hat. Adds an egg to the costume landmark for honks and giggles.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5359 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-19 06:36:12 +00:00
giacomand@gmail.com 7b3ca4e0d9 Reverted r5355.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5357 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-18 23:51:10 +00:00
giacomand@gmail.com 452a241251 -Summoning Nar-Sie will be the only objective of cultists.
-You can only summon Nar-Sie on the station Z level. Added more text to explain this.

This commit has been approved by the people of coderbus.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5355 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-18 20:31:55 +00:00
cib f769bcffb3 Fixed an indentation error. 2012-12-18 18:40:55 +01:00
cib 85ec5157fe Forced antags are now logged to admins.
This might help tell bugs from simply no one having chosen the role.
2012-12-18 17:25:14 +01:00
Zuhayr 24473bdd19 A small fix to the throwing string when a mob is struck with a baton. 2012-12-19 01:57:47 -08:00
cib 455b0a7c3b Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature
Conflicts:
	code/game/gamemodes/events.dm
2012-12-18 14:08:41 +01:00
ericgfwong@hotmail.com beaf10ed6a Medibots now only use Tricordrazine and Spaceacillin for all their treatment-related activities.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5353 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-18 04:22:26 +00:00
ericgfwong@hotmail.com d8230cbd18 Updated DJ Station instructions
Re-added Old Note
A few more changes to the old assembly line to make it more convincingly derelict.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5352 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-18 02:25:16 +00:00
ericgfwong@hotmail.com b76c8fd4f0 Changed Mulebot access to Cargo Tech and removed its robotics access.
Changed floorbots' req_access to access_construction so both atmos and engineers can use it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5346 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-17 06:15:56 +00:00
petethegoat@gmail.com c8efd1e59b Updated the map with fixed incinerator doors that use the new heat_proof var.
Added a few film canisters to art storage and the dorms.
Fixed a misplaced wall in R&D.

Added a new carpet icon_state, so the dorms don't have to look stupid.

Added a new option for key auth devices, it removes the maint access requirement from all doors.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5345 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-16 20:52:29 +00:00
giacomand@gmail.com eca72b69aa -Added constructable solar arrays.
-Added a solar pack crate to order.
-Machines that have a use_power of 0 will no longer be turned off due to lack of power in the area.
-Fixed a bug with the solar computer not reconnecting to the powernet when dismantled and remantled.
-Increased the cap of crates to 30.
-Some performance tweaks.
-Some standardization.
-All objects of type /obj/machinery/power will try to disconnect from the powernet before deleting, this will help reduce the node list size.
-Added a heat_proof variable for doors. It will effect glass airlocks and it'll determine whether they can block heat or not. Research glass airlocks will always have it enabled.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5344 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-16 19:51:23 +00:00
ericgfwong@hotmail.com 41e3f7bf64 -Added fire extinguishers to xeno and viro
-Added lights to singularity containment
-Engineering lockers now use Power Equipment access
-Expanded Tox Storage access to include the Tox lab, making it a separate access like Xenobiology

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5343 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-16 19:10:45 +00:00
Jim "Apples" 11427734c3 Merge pull request #2073 from CIB/bugfix
Make setblock able to handle block index 0
2012-12-16 09:23:25 -08:00
cib 8512bdd8d7 Make setblock able to handle block index 0
It will simply do nothing. Fixes issue #2049
2012-12-16 17:45:20 +01:00
cib ebb8a73ee3 Derp in previous commit.
Whoops. :(
2012-12-16 16:37:38 +01:00
cib 847c1efd0f Fixed a problem with events probability.
I multiplied with "percent" chances, without dividing by 100. Would lead to permanently 100% chance of anything.
2012-12-16 16:16:21 +01:00
cib d94faea360 Event system now takes department activity into account.
Pretty much an overhaul of the whole event choosing system, which makes it a bit better IMO. Ported this from my larger feature request branch.
2012-12-16 15:15:18 +01:00
cib d0735e9a87 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature
Conflicts:
	code/ZAS/ZAS_Zones.dm
	code/game/gamemodes/events.dm
2012-12-16 15:10:04 +01:00
cib 933e53aa98 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into minor_feature
Conflicts:
	code/game/gamemodes/events.dm
2012-12-16 15:02:54 +01:00
cib 679c715482 Merge branch 'master' of github.com:Baystation12/Baystation12 into minor_feature 2012-12-16 14:57:54 +01:00
Hawk-v3 9ed0e80acf Merge pull request #2058 from GauHelldragon/master
Portable Generator Fix
2012-12-16 05:55:56 -08:00
cib a6d5a6a26e Removed yet another type of gib that looks like a head.
Just how many heads does a person have, according to this code?
2012-12-16 04:40:19 +01:00
cib 49958de6aa Removed loyalty implants from all security except the HoS.
See http://baystation12.net/forums/viewtopic.php?f=5&t=6318
2012-12-16 04:11:55 +01:00
cib 0855c5d1af Fixes issue #2006
Medical belt can now hold autoinjector.
2012-12-16 04:04:43 +01:00
cib caf56c4c7d Merge branch 'bugfix' into minor_feature 2012-12-16 03:41:32 +01:00
cib a6d1a666a9 Merge branch 'bugfix' into feature
Conflicts:
	code/game/gamemodes/events.dm
2012-12-16 03:41:11 +01:00
cib 7b8a33dc53 Fixed compile error regarding unclosed comment in events.dm 2012-12-16 03:39:45 +01:00
cib 9c4a48ffe5 Gibbing now creates actual limbs instead of decals.
Especially useful for the head, but also pretty nice in that you can now pick the limbs up and mail them to security.
2012-12-16 03:25:26 +01:00
cib 62d88717ba Fixed a bug with rev objective checking.
If a single alive, non-converted head left the station z-level, it'd be a victory for the revs.
2012-12-16 00:18:50 +01:00
ericgfwong@hotmail.com 00ddbce06e They're not referred to as cores any more...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5334 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-15 20:37:23 +00:00
giacomand@gmail.com 7caff5dd42 -Proper fix for the scrubber/vent runtimes.
I made the vents and scrubbers update the area scrubber/vent info themselves, meaning that an air alarm isn't required to initialize the area/vent info and to stop it from being null.

This will add more flexibility in the future.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5331 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-15 18:59:47 +00:00
Jim "Apples" cff920917b Merge pull request #2054 from caelaislinn/work_in_progress
Various
2012-12-15 04:08:07 -08:00
Zuhayr aedf5f2068 Ty Foster's custom necklace, Butcher Royce's custom Ripley skin and some minor changes to support it. 2012-12-15 02:08:03 -08:00
ericgfwong@hotmail.com be7fa592f1 Added HoP jumpsuit to the steal objectives list.
Grammar fixes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5328 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-15 07:44:48 +00:00
d_h2005@yahoo.com 48c0e5626f Committing for Intigracy: Adds new Steal objectives, and allows admins to assign a new objective type.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5327 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-15 07:22:50 +00:00
ericgfwong@hotmail.com 3198faf3d9 Merged Atmos Refilling and Monitoring rooms: https://dl.dropbox.com/u/831776/refill4.png
Added blast doors over CE office
Added Atmos lockdown button to CE office
Moved Hypospray into CMO's locker

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5323 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-15 04:11:58 +00:00
Cael_Aislinn 67b0e79b29 removed vermin spawn turf selection (was causing a short freeze at roundstart)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-15 12:40:23 +10:00
Cael_Aislinn 50c4c120ba space ninja candidates have a timed popup asking the player if they accept (using ShadowDarke's sd_Alert), minor formatting cleanups
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-15 12:39:22 +10:00
giacomand@gmail.com 8ee2905051 -Fixed an issue with AIs being unable to suicide.
-Fixed Issue 1163 with AIs not taking oxygen damage while ghosted/disconnected.
-Reverted my failed experimental exploit patch for AIs seeing through the camera-less fog.
-Removed some unneeded spawn()s from AI Life().

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5322 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-14 23:42:33 +00:00