Commit Graph

7077 Commits

Author SHA1 Message Date
Cael_Aislinn
1bf5b97b2e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	code/modules/customitems/item_spawning.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-22 18:31:52 +10:00
Chase Clary
565451fa78 REALLY fixes Roaper's custom item (I forgot to code the spawning thing-y for his ID) and adds mah cane. 2012-09-12 21:14:50 -05:00
Chase Clary
605b4872e1 Should fix the custom item problem with Roaper's ID. I can't tell for sure though, because I have no way to test it. 2012-09-09 17:24:45 -05:00
Cael_Aislinn
69ec1e3eca added random barsigns. will add them to the map when we get closer to merging
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-09 00:39:43 +10:00
Cael_Aislinn
e760e4ca81 Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport 2012-09-09 00:29:41 +10:00
Cael Aislinn
daeb09c4c2 Merge pull request #7 from ThatOneGuy42/bs12_with_tgport
-Should- add Crew Transfer Shuttle.
2012-09-08 07:27:52 -07:00
Jim "Apples"
dd8964b0eb Merge pull request #1706 from Asanadas/master
Adding 2 custom items
2012-09-08 04:02:48 -07:00
Cael_Aislinn
17621adbd8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport (used bs12 icon for the new smes sprites, but this may cause other issues)
Conflicts:
	icons/obj/power.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-08 20:25:15 +10:00
Cael_Aislinn
6d6c328c03 limits alien players in any round to 20% of total alien/human players (ignores ai/cyborgs)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-08 15:30:14 +10:00
Cael_Aislinn
f7fcfa2a6f Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4649)
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/machinery/computer/law.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html
	icons/effects/effects.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-08 14:22:44 +10:00
elly1989@rocketmail.com
8432491e46 Corgis don't talking! :(
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4649 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-08 02:09:48 +00:00
elly1989@rocketmail.com
8683eda506 Removed some punctuation from Ian's pirate costume-name.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4648 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-08 02:03:36 +00:00
Chase Clary
fa29365cf5 Should add Roaper's custom ID. 2012-09-07 19:18:07 -05:00
johnsonmt88@gmail.com
7514e800d5 Must have had some kind of hiccup, the 'return' didn't get committed?
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4647 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-07 22:15:15 +00:00
johnsonmt88@gmail.com
438d55ed44 The late-join button now requires the ticker's state to be GAME_STATE_PLAYING.
Meaning that you can not late-join before the round actually starts or after the nuke up/malf ending cinematic.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4646 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-07 22:04:55 +00:00
Asanadas
a13b922ed8 My attempts at adding custom items for executivekill http://baystation12.net/forums/viewtopic.php?f=33&t=5156
and thejesster14
http://baystation12.net/forums/viewtopic.php?f=33&t=4936

Signed-off-by: Asanadas <asanadas@hotmail.com>
2012-09-07 17:59:01 -04:00
giacomand@gmail.com
75cf50fa17 -Reverted the maintenance cameras.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4645 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-07 16:49:34 +00:00
petethegoat@gmail.com
6f27b40a96 Single tank bombs.
There's a couple of known issues, and they've not been tested, so they're unticked for now.

This includes some adjustments and fixes for other assembly stuff, and it also renames most tanks.

Shout at me if this breaks anything.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4644 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-07 13:39:13 +00:00
elly1989@rocketmail.com
aeaf790882 Removed a spawn() from rad_collector/New()
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4643 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-07 09:48:57 +00:00
giacomand@gmail.com
f39dd65748 -Added maintenance cameras. These are cameras which are located in maintenance, not only that but they have a 66% chance of not spawning. Leading to random blind spots in maintenance.
-Fixed large grenades, removed the reliability prob().

-Added maintenance cameras on the map.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4642 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-07 09:33:10 +00:00
elly1989@rocketmail.com
ca7cb95b7d Moved cyborg law-syncing back into New().
New Borgs now sync with the AI with the fewest associated borgs. So, say there were 3 AIs and 6 borgs, each would get two each.
Cyborg cells now default to 7500 (like the transform procs do), this is so admin-spawn borgs don't end up with 1500-charge cells with a max of 1000-charge.
Default lawset is asimov rather than an empty lawset
pulsing a borg's sync wire will cause it to randomly pick an AI.
As a borg, your laws are shown to you at login.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4641 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-07 09:24:54 +00:00
giacomand@gmail.com
65a4545784 -Attempted fix for messages being sent twice. I added a variable to keep the "spawn(10) recent_messages = list()" in sync, so only one broadcaster can do it at a time. Added the frequency of the message, so you can send the same message on multiple frequencies via multiple radios.
-Added an "in machines", for the AI call shuttle proc, so it doesn't look in the world.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4640 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-07 04:39:44 +00:00
d_h2005@yahoo.com
21c60a21bd -Obligatory flour conversion bugfix commit: Fixes donk pockets needing flour to be warmed up.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4639 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-07 03:41:36 +00:00
SkyMarshal
cf04246f96 Revert "Random not much finished bullshit work on mapdata."
This reverts commit d3179bb5b5.
2012-09-06 15:51:23 -07:00
SkyMarshal
4d7b17208d Update for everyone wishing to make a spacecraft, has a small map file (7x9) of a effective supermatter reactor (untested) and some changes to allow TEG's to be rotated.
Signed-off-by: SkyMarshal <skymarshal1729@gmail.com>
2012-09-06 15:48:11 -07:00
SkyMarshal
0532c59cb5 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-09-06 15:44:21 -07:00
giacomand@gmail.com
ecd2bcec56 -Holograms are range based again.
-Instead of the singularity using range to look for rad_collectors around it, it will now look through the list and check the distance between every rad_collector, if it's less than 15 tiles in range then it'll give it power.
-Fixed naming your revolver.
-

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4638 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-06 21:24:33 +00:00
d_h2005@yahoo.com
0619a8f5de -Changes flour from an item to a container-held reagent. All recipes have been updated to use 5 units of reagent flour for every item required previously.
This has a few advantages: The 16(!) sacks of flour previously in the kitchen cabinet have been condensed to an equivalent 3 sacks. Beer is now brewable with universal enzyme, and converting lots of wheat into flour should be less tedious. Also, flour grenades, etc.
Because of this, flour is now obtained from the all-in-one blender rather than the processor, and spaghetti noodles are made with 5 units of flour in the microwave.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4637 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-06 15:55:44 +00:00
giacomand@gmail.com
565b868ebc -Added a presets file for telecommunications. Moved all presets there.
-Made the Chief Engineer's cigarette spawn unlit. It was causing runtimes and everyone else spawns with unlit cigarettes.
-Updated changing AI name so it changes the eyeobj and the PDA, removed the PDA name from ai/life.dm()
-Removed a useless comment in uplinks.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4636 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-06 09:36:45 +00:00
elly1989@rocketmail.com
907793619d proc/activeais() now fetches AIs from the list of living mobs, not the list of mobs with clients. This fixes an issue where AIs could prevent being selected for law updates by logging out for a bit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4635 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-06 06:53:52 +00:00
Cael_Aislinn
d02a411e2f various compile fixes, added bs12 moderator rank
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-06 15:09:36 +10:00
Kortgstation@gmail.com
6deb60261d Summon guns now auto activate when you buy it. Because it auto-activates, there is no risk of wasting points by buying multiple uses at once, nor does it appear in some random tab of its own.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4634 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-06 04:55:31 +00:00
Cael_Aislinn
56f5cb9e4e Merge tgstation r4633 into bs12_with_tgport
Conflicts:
	code/defines/obj/costume.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/structures/crates_lockers/closets/fitness.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/living/simple_animal/parrot.dm
	code/modules/power/power.dm
	code/modules/power/switch.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-06 13:13:57 +10:00
Cael_Aislinn
ad75e6b352 merge with tgstation's r4618, removed some broken bs12 merges (organs, pain)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-06 13:09:20 +10:00
giacomand@gmail.com
db2d703f72 -Holograms can move around again. I'm also experimenting with them being area based, meaning they can move around an area freely and lose their hologram when they leave the area. I've made it a const option, so change HOLOPAD_MODE to 0 to return it to the old system, which will destroy the hologram when it is out of range of the holopad.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4633 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-06 02:33:30 +00:00
elly1989@rocketmail.com
46524c533a Runtime fix:
runtime error: Cannot execute null.ex act().
proc name: explosion (/proc/explosion)
  source file: explosion.dm,52
  usr: 0
  src: null
  call stack:
explosion(space (133,173,1) (/turf/space), 4, 5, 6, 7, 0)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4632 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-06 01:55:03 +00:00
giacomand@gmail.com
2499ce6b6e -Some more html fixing, for communication runes and books.
-Added a badmin secret.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4631 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-06 01:05:32 +00:00
quartz235@gmail.com
121a8f78e0 Fixes issue 836
- Bomb admin logs now tell what type of device (if any) was attached to the bomb

Fixes issue 873
- Fat people can now use their slots properly (thanks to erro for pointing out the cause of the bug)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4630 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-06 00:03:23 +00:00
giacomand@gmail.com
6117b5d02f -Fixed Issue 849
-Fixed some other occurrences of this happening. If you find any, please post it here: http://nanotrasen.com/phpBB3/viewtopic.php?f=7&t=9955 
or let me know in #coderbus.

-Split up the Core() verb a bit.
-When sending messages to Centcom or the Syndicate, with the communications console, it would never reset itself since it resets the wrong variable. I've given it the correct variable and I made the cooldown 10 minutes instead of a minute.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4629 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-05 23:42:04 +00:00
quartz235@gmail.com
0c620b02ae Fixes issue 879
- False walls were pointing to the wrong dmi, rendering them invisible. Likely the define lost some lines during the huge restructuring.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4628 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-05 23:28:14 +00:00
johnsonmt88@gmail.com
d91ea514d9 More file structuring.
closet.dm, costume.dm, decal.dm and window.dm have been knocked out of the define folder and their defines have been moved into appropriate files.

The closet folder has been re-organized a little.

supplypacks.dm has been moved into the datums folder since that's what it is.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4627 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-05 22:44:48 +00:00
giacomand@gmail.com
f97f3982bc -The upgrade camera malf module now upgrades cameras to be motion cameras too.
-Made the alarm delay a variable and I decreased it to 10 seconds. There's another 10 seconds in queueAlarm, so it's 20 seconds total before the motion alarm triggers.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4625 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-05 17:00:17 +00:00
elly1989@rocketmail.com
c81c70bd86 Replaced var/netnum for cables and powered machines with a direct reference to their powernet. The bug which was causing cutting and merging powernets to fail was due to my attempts to fix the powernets slowly becoming filled with null entries. Removing those null entries messed up the indexes and essentially jumbled up the powernets. :( sorry
Fixed the failsafe misreporting how long the MC has been dead.

Lighting initialization no longer 'interrupts' the master_controller setup().

Added updated powernet debugging tools. They're in my WIP folder. They are sexy c: It draws the powernet onto the map so you can see what's going on during debugging.

Added tachyon-doppler arrays. They're gonna be something for scientists to measure their bombs with rather than praying for the figures. Nothing spectacular.

Commented out switches, they aren't used and I've been fixing/testing powernets all day. Sorry. If you need them back  just PM me and I'll fix them.

Known issues: the merging procs behave silly at intersections. I really tried to fix it but I think I'll make more progress just working on some powernet improvements.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4623 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-05 16:14:24 +00:00
giacomand@gmail.com
5ed77f8dad -Made motion cameras use HasProximity if they aren't area based motion cameras. This will allow people to set up motion cameras that will set off, without having to be in an "AI Monitored" area, such as EVA.
-Removed cameras from all bots. I'll change this if there's an outcry but my reasoning is that the bot's cameras don't work well with freelook, removing it would save a lot of trouble and would help out in certain rounds. I also doubt people even care about viewing the bot's view, I sometimes forget it's a thing.

-Make the AI's cancel camera view the same verb as AI Core. I did this because people were getting really confused on how to return to their core view, and the verb was basically useless since people just stopped tracking by moving a tile in a random direction.

-Removed a floating camera in Engineering. -Removed a camera in the AI Chamber (front of the AI) and I made the camera an "All" camera. (EMP Proof, X-Ray and Motion)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4622 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-05 05:30:56 +00:00
johnsonmt88@gmail.com
c486f4cb93 A file didn't get ticked... woops.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4621 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-05 02:11:14 +00:00
johnsonmt88@gmail.com
ec0ef6e42a Committing the parrot stuff I have so far. It is still a work in progress and I've made sure it's not possible to spawn them yet.
So far they walk around, find a perch and sleep on it... They don't copy speech yet but they do look around for items to steal to add to their collection! So basically I have made a magpie so far... The parrot bits will come later I swear.

They currently use the baby chick sprite but there's a much better sprite already in the works thanks to Pewter.


Oh also, I've moved that headset/ear variable out of simple_animal and into simple_animal/parrot since only parrots can do anything with them anyway.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4620 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-05 02:04:54 +00:00
giacomand@gmail.com
b888b60567 -Increased the delay for the recent messages filter to reset. This will hopefully stop telecomms from broadcasting twice during lag.
-Added obj/effect's to update what the AI can and cannot see. Resin walls and smoke can block vision.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4619 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-04 14:09:18 +00:00
Cael_Aislinn
dc3f6f2239 Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport (probably broke ZAS again)
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/defines/obj/weapon.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-04 22:23:50 +10:00
Cael_Aislinn
c4bd191222 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/defines/obj.dm
	code/game/gamemodes/events.dm
	code/game/machinery/newscaster.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/game/turfs/turf.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/maps/fromdmp.dm
	code/modules/mob/living/silicon/ai/freelook/eye.dm
	code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_movement.dm
	code/setup.dm
	icons/mob/uniform.dmi
	icons/obj/closet.dmi
	icons/obj/clothing/uniforms.dmi
	maps/RandomZLevels/assistantChamber.dmm
	maps/RandomZLevels/fileList.txt
	maps/tgstation.2.0.9.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-04 22:19:03 +10:00
Cael_Aislinn
2a4433ec59 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/verbs/AI_status.dm
	code/modules/mob/living/silicon/ai/ai.dm
	config/custom_items.txt
	icons/mob/AI.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-04 22:11:21 +10:00