Commit Graph

10100 Commits

Author SHA1 Message Date
cib
a577c0bfac Fixed a few bugs with IV drips. 2012-10-15 18:01:31 +02:00
cib
82dca5a4a0 Added an IV drip machinery. 2012-10-15 17:19:43 +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
cib
6ca73039fb Wounds now bleed only until a certain stage. 2012-10-15 15:27:10 +02: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
cib
8b630d9b49 Merge github.com:Baystation12/Baystation12 2012-10-15 15:06:21 +02:00
headswe
b24b176a44 Merge pull request #1767 from comma/master
Dammit.
2012-10-15 05:50:36 -07:00
Chinsky
ad34ad9da4 God dammit, fix. 2012-10-15 16:48:13 +04:00
headswe
6b4593a80c Merge pull request #1765 from comma/master
Surgery.
2012-10-15 04:49:42 -07:00
headswe
28e38cd590 Merge pull request #1766 from headswe/master
Runtime
2012-10-15 04:47:23 -07:00
headswe
3e0ac92456 Merge pull request #1763 from Ravensdale/master
Cargo atmos systems adjust
2012-10-15 04:46:35 -07: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
Head
ad0be72f88 Fixed runtime.
Signed-off-by: Head <sebbebroberg@hotmail.com>
2012-10-15 13:32:58 +02:00
Chinsky
1bcfdfbd98 Now lighters only burn hand user is holding them. Bye bye, 80% of crew groin burns. 2012-10-15 15:30:42 +04:00
Chinsky
385dbe9fe9 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-15 15:13:57 +04:00
Chinsky
eb6d63cc07 Should be everything for surgery for now.
-Fixed some more messages.
-Added that if you try to set not broken bone with bone setter, you won't like the result
-Moved code for fracturing bones to the separate proc.
2012-10-15 15:13:34 +04: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
DarkTechnomancer
b99dae5c89 Fixed health analyzers 2012-10-15 02:57:48 -04:00
DarkTechnomancer
a6aa56707a Fixed machine building prompts 2012-10-14 23:05:58 -04:00
johnsonmt88@gmail.com
f223c4451a Fix for radiation suit lockers looking like EoD closets. Fixes issue 1010.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4881 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-15 01:49:54 +00:00
johnsonmt88@gmail.com
757410d487 Closets now pick up all items on the tile they're created on, the same as crates. This makes it easier for mappers to put things in lockers without making new locker types or var-editing them.
Moved snowflake telecomm ambient sound code that only half worked into the switch that's designed to handle it.

Committing for Aranclanos:
- Toggle ambience should now properly work. Fixes issue 992.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4880 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-15 01:28:06 +00:00
Ravensdale
f844b7baca Raises cell timer cap from 10min to 60min 2012-10-14 17:52:06 -07: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
Chinsky
44675fb12e Surgery was working, yes yes, but not good enough, no.
Must stay true to the System, yessss.

Aside form fixing lots of mix ups with who cuts who in messages, separated some steps in their own datums.
-mending skull from setting bone (different message and different failure penalty)
-incising eyes and face (2 separate steps) from generic incising (different start condition (eyes), different messages, different failure penalties)
-cautering eyes and cautering face (2 separate steps) from generic cautering (different messages, different effects on success, different penalties on failure)

COuld have realized them as cascade of ifs in generic steps, but though this way will be more in spirit of step system, and generally a bit more readable, if longer.
2012-10-15 01:50:22 +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
Asanadas
1fcaf5b376 Nerf cheap lighters.
Signed-off-by: Asanadas <asanadas@hotmail.com>
2012-10-14 14:42:08 -04: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
Chinsky
9befbd6aa9 Surgery done. 2012-10-14 20:31:07 +04:00
giacomand@gmail.com
e404e7774e -Replaced two manual valves in atmos (above the canister ports) with easier to use pumps. This will let you easily redirect the flow of the gas.
-Busses can now be connected to broadcasters.

Meaning a simple setup of:

Receiver -> Bus -> Processor -> Bus (same bus) -> Broadcaster.

Not as fast as the current setup, but it would be nifty for emergencies.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4875 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 11:03:07 +00: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
60cbe6a39e - Failed to notice two logic problems... Fixed.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4864 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 22:37:14 +00:00