Commit Graph

4070 Commits

Author SHA1 Message Date
Kortgstation@gmail.com
ac75903c33 New bluespace artillery sprites by Ausops.
Updated the gun/my map to use them.

Fixed an error in the holo-deck logging. "overrided" is not a fucking word.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4888 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-16 02:55:51 +00:00
petethegoat@gmail.com
aa60fde7f4 Fix for borked atmos on away missions. This may still need some further tweaking, but it definitely fixes the issue. I looked at the powernet issue too, but I couldn't reproduce it anymore. Maybe it's fixed.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4887 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-16 02:08:51 +00:00
headswe
f296f9c3c8 Merge pull request #1761 from caelaislinn/bs12_with_tgport
misc merge things
2012-10-15 10:59:58 -07:00
headswe
3e94d7a682 Merge pull request #1768 from CIB/master
Bleeding fixes
2012-10-15 10:59:27 -07:00
cib
8f2055080d Increased blood pack volume and IV injection rate. 2012-10-15 19:48:20 +02:00
cib
150d7e51b5 Added some medical stuff to the map.
Also added blood packs.
2012-10-15 19:17:38 +02:00
petethegoat@gmail.com
606e40729a Fixed issue 1008. (Putting stuff into the seed extractor doesn't update sprites)
Added floor safes.
Fixed the icon paths (or lack thereof) for bluespace artillery, and the capitalisation.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4883 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-15 16:17:55 +00:00
Chinsky
468752ea6d Ported BS12 slur.
Sorta. Can't use html in said strings, so it will look a bit different.
2012-10-15 20:14:34 +04:00
Chinsky
514989394f Cleaned up food and drinks code.
God bless OOP.
2012-10-15 20:13:35 +04:00
cib
a577c0bfac Fixed a few bugs with IV drips. 2012-10-15 18:01:31 +02:00
petethegoat@gmail.com
5b1e7cb336 Removed the bandolier, on account of it looking like shit. In the two places where it was used, it's been replaced with the normal satchel.
Added the safe! A majestic two tumbler chunk of metal.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4882 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-15 15:01:16 +00:00
Cael_Aislinn
548f60d25d Merge remote-tracking branch 'remotes/git-svn' r4881 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/game/gamemodes/events.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/gateway.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/sound.dm
	code/global.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/handlabeler.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/photocopier.dm
	code/modules/paperwork/stamps.dm
	code/world.dm
	html/changelog.html
	maps/RandomZLevels/fileList.txt

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-15 23:17:18 +10:00
cib
19846abebe Halved bleeding speed. 2012-10-15 15:13:49 +02:00
Cael_Aislinn
d38cf3da27 re-enabled alien player's hair and facial hair
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-15 21:43:40 +10:00
Cael_Aislinn
e00a696a40 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-10-15 20:57:54 +10:00
johnsonmt88@gmail.com
a48519f105 Fixed a parrot verb so that players can not drop items after they've died.
Commiting for Aranclanos:
- Mimes can once again use deadchat when dead. Fixes issue 996.
- Exiting Cryostasis will leave you cold, but not cold enough to take burn damage. Fixes issue 995.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4879 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-15 00:05:16 +00:00
Chinsky
988928b086 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-15 01:52:02 +04:00
baloh.matevz
266f163879 - To support the SQL based admin rank system, I added a permission assignment panel, which is accessible to the people who have the PERMISSIONS permission. This panel can be used to add new admins, remove or edit the rank of existing admins.
Screenshot:
http://www.kamletos.si/permissions%20panel.PNG

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4878 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 19:45:21 +00:00
Kortgstation@gmail.com
80d18c4b1e Mediborg's hypospray produces Doctor's Delight instead of Tricord.
CMO's hypo starts filled with Doctor's Delight.

Syndicate simple animals have a higher block chance vs projectiles than they do vs melee attacks (there are just way too many guns strewn about my map for them to live long otherwise)


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4877 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 19:05:48 +00:00
Asanadas
840ed30875 Fixed a spelling error in the Jensen HoS coat. Sponsored by tasty Trenchoats.
Signed-off-by: Asanadas <asanadas@hotmail.com>
2012-10-14 15:04:00 -04:00
petethegoat@gmail.com
edb2283ab4 Removed the Boo! verb.
Fixed ghosts being able to rotate chairs.
Removed the chance for players to hear muffled speech when ghosts talk.
Removed the syndicream reagent, and replaced it with doctor's delight in the two snacks it was in.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4876 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 18:48:23 +00:00
Chinsky
8427947bd7 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/datums/organs/organ_external.dm
	code/modules/mob/living/carbon/human/human.dm
2012-10-14 20:39:26 +04:00
giacomand@gmail.com
e00fd0fd4b -Fixed the flags for head items. Most space helmets will protect your face.
-Welding mask will protect your face if it is down.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4874 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 07:33:19 +00:00
giacomand@gmail.com
9047fbee05 -Re-added the sound effect that Robots made when brought to life.
-Made the alien damage multiplier not heal them better.
-Strongly nerfed the amount of burn damage aliens healed naturally (not on weeds)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4873 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 06:49:15 +00:00
Cael_Aislinn
d5a4a268d7 moved mod panel to a new file, removed the admin stuff from it
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-14 14:31:45 +10:00
Cael_Aislinn
4e08f61642 made the alien player limit a config option
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-14 13:59:50 +10:00
petethegoat@gmail.com
eae0178138 Removed a stupid dumb wrong bad define from explosion_recursive.dm. It was a typo define for rwalls, but the proper define was right below it.
Fixed a typo in bluespaceartillery.dm.
Fixed invisible filing cabinets.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4872 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 03:24:05 +00:00
headswe
10f32d1351 Merge pull request #1760 from DarkTechnomancer/master
Fixed flavor text
2012-10-13 20:10:18 -07:00
Kortgstation@gmail.com
dae813ec40 Removed the old gateway structure placeholders.
Made the gateway check for another gate before checking for whether it is charged. This is too stop poor confused players standing at the gate waiting for it to locate an away mission when one isn't loaded.

Ticked stationcollision.dm so it is actually possible to play Nodraks map without specifically compiling your server to do so.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4870 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 02:04:10 +00:00
giacomand@gmail.com
ddd8e94784 -Walls, firelocks and glass-less airlocks now stop heat.
-Fire made more deadly, as the flames will add more damage and a fire can spread more quickly.
-Fire can break windows now, meaning they can potentially extinguish themselves by opening a window to space.
-Increased the delay for atmos to process a cell and airgroup, will help with the lag for 50 player servers.
-Minor tweaks were made.
--Plasma needing a bit more before displaying its overlay.
--Pressure can now damage you at 550 kPA. This was because it wasn't viable to set the pumps to over-pressurize a room and potentially kill people.
--High pressure warning shows at 325.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4869 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 02:02:18 +00:00
petethegoat@gmail.com
65f4910c94 Updated trashbag code a teeny tiny bit. Mostly just changing it to use proper text styles.
Added a world.log message when away missions are loaded.
Fixed a spelling error in stationCollision.dm.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4868 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 02:01:54 +00:00
Kortgstation@gmail.com
e6296952fa Fixed the medkits on my map being empty.
Removed several turrets from the syndicate ships, as they made them impossible to leave/killed the syndicate mobs.

Gave the syndicate mobs slightly more health, as the unshielded ones were dying before they could react.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4867 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 01:54:19 +00:00
Kortgstation@gmail.com
b5c2593e53 Changed my mind, only the syndicate mobs in RIGs are slower
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4866 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 01:12:20 +00:00
Kortgstation@gmail.com
ec10add191 Fixed the syndicate NPC shields. They only block 1/5 attacks now
Made syndicate NPCs slower.

Made the e-sword NPCs do less damage.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4865 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 01:01:33 +00:00
DarkTechnomancer
4bf6833a62 Fixed flavor text 2012-10-13 19:27:43 -04:00
headswe
c04c26fa29 Merge pull request #1759 from headswe/master
Fixed Organspam (Maybe)
2012-10-13 15:44:42 -07:00
Head
085d357b4b Hopefully fixed organ spam. 2012-10-14 00:43:23 +02:00
baloh.matevz
a5b37f81c3 - Added a config option that allows the admin system to run off of data from the database. There is a config options in config.txt that dictates whether to use the new SQL based system or the legacy admins.txt system. If a server is set to use the new system, but a connection cannot be established to the database, it reverts to the legacy system, same applies if a query to the database returns empty. The config option defaults to use the legacy system.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4863 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 22:32:51 +00:00
Chinsky
c3b53af100 Commiting for the night, in case KGB steals my laptop.
Pretty much finished surgery system.
-working appendectomy, bone surgery, eye surgery, face surgery, brain surgery (humans only) and metroid core surgery.

-moved operation stages tracking vars to one op_stage datum. Left brain opstage var alone because way too many things reference it.

-added bone gel and bone setter.

-added check for surgery tools, so new doctors won't beat shit out of patients on optable too often.

-pretty much emptied surgery_tols.dm, it was unneeded by this point.

Still need to test it more, slap sanity checks everyfuckingwhere.
Also more literate messages written with help of trained monkey (faux).
2012-10-14 02:15:23 +04:00
giacomand@gmail.com
940808ee86 -New facehugger animation by Sly.
-Moved "debug_controller" to badmin, so if the controller needs debugging a game admin can promote a coder to badmin and allow them to debug it.
-Fixed an issue with aliens having two different status tabs.
-Moved all facehugger icons to icons/mob/alien.dmi

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4862 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 21:26:30 +00:00
baloh.matevz
3def1bd57a - Added corgi puppies to code:
Screenshot:
http://www.kamletos.si/puppy.PNG

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4860 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 20:31:35 +00:00
petethegoat@gmail.com
7d0dc98613 it keeps happening
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4859 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 19:54:56 +00:00
giacomand@gmail.com
3dd4f8cbc5 -Optimized freelooking a bit.
-Larva can now die, instead of staying in critical.
-Improved the prison break event.
-Added the cameranet to the list of debuggable controllers (I know it's not technically a controller but it seems like the best place to be).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4858 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 19:52:41 +00:00
petethegoat@gmail.com
c4382905e5 Stamps are applied based on the icon_state of the stamp. Saves a switch.
They are also offset by a random amount.

Sosjerky is now properly named.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4857 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 18:55:09 +00:00
cib
415e1c47d9 Made nudge.py script location configurable. 2012-10-13 11:11:57 -07:00
cib
c747e5e56e Chloral hydrate and sleep toxin now have a small delay before taking effect. 2012-10-13 10:51:08 -07:00
cib
160328741e Made the human/drip() proc produce larger pools. 2012-10-13 10:08:12 -07:00
cib
31093ce666 More messages for low blood. 2012-10-13 09:59:17 -07:00
cib
e77afd5ab9 Added bleeding and blood transfusion. 2012-10-13 09:45:33 -07:00
cib
4f1d301880 Examine now only reveals you're dead by checking pulse. 2012-10-13 08:57:03 -07:00