Commit Graph

9304 Commits

Author SHA1 Message Date
Cael_Aislinn 0f3f008ff6 mergefixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 02:22:06 +10:00
Cael_Aislinn 01d3e3bf79 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	code/datums/disease.dm
	code/modules/reagents/Chemistry-Reagents.dm
	icons/turf/areas.dmi
	maps/tgstation.2.0.9.1.dmm

yep, this time going to merge map updates before making map changes >.>

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 01:25:04 +10:00
Cael_Aislinn 2a07ba0f6e mergefixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 01:04:37 +10:00
aranclanos@hotmail.com 7bbf30c800 Fixes issue 1007. Changed the throwforce of the holodeck energy swords from 5(!) to 0.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4921 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-20 14:39:11 +00:00
Cael_Aislinn 2f853fe23a Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/devices/radio/radio.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/say.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/paperwork/paperbin.dm
	html/changelog.html
	icons/turf/areas.dmi
	maps/RandomZLevels/assistantChamber.dmm
	maps/RandomZLevels/fileList.txt

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 00:25:05 +10:00
Cael_Aislinn 3fe88c4fef mergefixes, misc
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 00:11:01 +10:00
headswe 4a7c435748 Merge pull request #1802 from comma/master
Runtime
2012-10-20 06:21:50 -07:00
aranclanos@hotmail.com e4bcc80405 git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4917 316c924e-a436-60f5-8080-3fe189b3f50e 2012-10-20 02:51:12 +00:00
giacomand@gmail.com ba32520ca2 -Forgot to remove a debug message.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4916 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-20 02:23:26 +00:00
giacomand@gmail.com 28fbd01e7f -Added a new, and admin spawnable only, machine which can turn humans into Cyborgs. Probably can be used for Robot Uprising events. The human has to be lying down and alive to be Borged. When spawned a conveyor belt will spawn on the left and right side too.
-Reduced the duration of the flare. I think putting it in process() made it last longer.

-Added some null checks in camera chunks.

-Large NarSie now force calls the shuttle and displays a threatening warning message.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4915 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-20 02:13:40 +00:00
giacomand@gmail.com 1e1f173ca2 -Added large Nar-Sie. It is summoned by Cultists instead of regular Nar-Sie.
-Larger icon provided by HornyGranny.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4914 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-19 20:38:53 +00:00
cib 926036a660 Fixed a few more problems with RP revolution and anti revolution.
Heads now get the chance to resign.
RP rev convert verb now is in the IC tab
2012-10-19 11:28:52 -07:00
cib c4d4f1950e Fixed an error in the anti-revolution objective description. 2012-10-19 11:08:07 -07:00
cib ce76e802f1 Fixed a small bug with anti-revolution. 2012-10-19 10:33:54 -07:00
cib bf3e910a12 Merge branch 'master' of github.com:CIB/Baystation12 2012-10-19 10:17:02 -07:00
cib bf83e5c3ba Added a new mode: anti-revolution 2012-10-19 10:00:54 -07:00
cib 172c974111 Changed the announcement for RP revolution. 2012-10-19 08:59:33 -07:00
cib 180a6267ef Small bugfix for rp revolution.
Lategame assigned head revolutionaries would still be regular revolutionaries.
2012-10-19 13:57:34 +02:00
cib 59fcb2cd17 Removed HONK from the possible random diseases. 2012-10-19 13:52:24 +02:00
Chinsky 5513280add Fixed runtime in C4 code 2012-10-19 14:31:54 +04:00
Mloc 740c6dc70f Merge pull request #1796 from CIB/master
RP Rev Fix
2012-10-18 13:55:52 -07:00
cib 89a8744630 Fixed an issue with the automated rev addition. 2012-10-18 22:23:49 +02:00
cib 28d6e81ea3 Fixed a bug with the rp-rev convert verb. 2012-10-18 21:16:06 +02:00
Chinsky f6bcb421d4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-18 21:35:13 +04:00
Chinsky 5f7c9d5518 Readded welder fuel.
Fixed issue with fire not generating light.
Fixed pre-merge issue with fuel passing through closed airlocks.
2012-10-18 21:25:24 +04:00
Mloc af8ab15ebf Merge pull request #1795 from CIB/master
Various fixes
2012-10-18 10:18:03 -07:00
Chinsky 7f9132e23a Fixes a runtime. 2012-10-18 20:58:35 +04:00
giacomand@gmail.com 2f68d2cd48 -Brain radio MMIs were fixed, they wouldn't broadcast the MMI's message.
-Fixed a bug where you couldn't talk into intercoms while it is dark.
-AIs can now type in the "track with camera" verb and get a list of names to show up. This can save time if the AI needs to track an individual.
-Deleted the old AI move.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4910 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-18 16:16:29 +00:00
cib b0aee942a7 You can now exame an IV drip to get the loaded chemicals and attached person. 2012-10-18 16:08:43 +02:00
Chinsky 274ac1d59c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-18 15:42:11 +04:00
Chinsky 16e6f178a4 Buffed fuel tank explosions. 2012-10-18 15:40:55 +04:00
cib d90944ad50 Several medical related changes.
- There's now internal wounds
- Appendicitis stage 4 causes internal wounds
- Added back the body scanner
2012-10-18 12:39:04 +02:00
Chinsky 886119787d Arrivals computer fixed forever. 2012-10-18 10:09:39 +04:00
Chinsky 92276c9887 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/modules/mob/new_player/new_player.dm
	html/changelog.html
2012-10-18 09:13:24 +04:00
Asanadas 0ba466e881 Removing Soghun stutters, fix for infinite BoH in BoH. 2012-10-17 19:18:17 -04:00
petethegoat@gmail.com d8c376188c Moved the tank dispenser define out of defines.
Changed the tank dispenser path from /obj/machinery/dispenser to /obj/structure/dispenser.

Fixed a bedsheet bin bug.

Updated the map and away missions.
Removed assistantChamber.dmm and desert.dmm.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4906 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-17 22:43:58 +00:00
cib a1aa3ddecf Ported limb selection. 2012-10-17 20:08:34 +02:00
Chinsky 45e40c09c0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-17 14:12:41 +04:00
giacomand@gmail.com 8273e419e2 Committing for Numbers.
* Fixed problems with Heat Exchanger facing
* Fixed massive problems with heat exchanger construction using the pipe dispensers

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4900 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-17 09:47:24 +00:00
giacomand@gmail.com f9501864d7 -Added new x-ray camera sprites. Icons by Krutchen.
-Slightly increased the temperature needed to break windows.
-Re-added a sound for screwdrivering the camera.
-Moved the autonumber camera stuff into the presets file.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4898 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-17 07:57:35 +00:00
giacomand@gmail.com 3b95730028 -Committed RavingManiac (Smoke Carter)'s Roros laying eggs.
http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=10501
-You can insert the Auth Disk by clicking on the nuclear bomb.
-Changed how aliens are selected. It will filter the list of possible candidates by checking for players who aren't inactive for more than a minute. If no possible candidates are found, it increases the filter by another minute. It does this 5 times before giving up.
-Alien embryos cannot have carriers and they are more likely to infect someone.
-The time it takes before a larva bursts is increased a bit.




git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4897 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-17 06:04:25 +00:00
Pobiega 49fbe5f312 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-17 07:42:30 +02:00
Pobiega 917e31cfff Fixed cleanbots stating panel panel instead of panel. 2012-10-17 07:41:17 +02:00
Kortgstation@gmail.com 4bb0e22624 Fixed palm trees. You can no longer shove them around, and you'll no longer appear standing over the top half of them.
Ticked Academy.dm so the Academy map can actually be played.

Removed desert.dmm and assistantChamber.dmm as they were both unfinished/terrible. One was literally just a z level of sand and bears, the other was a tiny room full of turrets. Neither even had gates.

Added a small, simple beach map and a new area for it (with tanning re-added). Just a place for the crew to relax. Nothing dangerous, nothing notable loot wise.

Updated the away mission fileList.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4896 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-17 05:12:39 +00:00
johnsonmt88@gmail.com 05f2c58d9b Admin observers:
- No longer see antagonists via /who command.
- Now have the 'toggle adminhelp sound' verb.

Removed a bunch of the 'deadmin_self' verb from various admins and gave it to admin observers. All admins should have it now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4895 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-17 01:13:26 +00:00
Asanadas e2abd0a9b8 Commented out BoH on BoH Singulos. 2012-10-16 20:52:28 -04:00
Chinsky da147b083c Added Forensics Technician jackets to Detective wardrobe. 2012-10-17 03:28:59 +04:00
Chinsky a4142fa098 Throwing metal (with non-zero m_amt) items will make electrified doors and grilles spark. 2012-10-17 00:09:49 +04:00
cib 848355292a Fixed bug with RP rev where anyone could become head rev, even non-revs. 2012-10-16 19:36:39 +02:00
cib 14805c3bf2 Added RP revolution. 2012-10-16 19:28:54 +02:00