headswe
2326abe31b
Merge pull request #1754 from Whitellama/master
...
Ports/Fixes for the merge!
2012-10-13 07:00:40 -07:00
cib
98386354bb
Fixed a bug in radio code where it would expect the user to be a human.
2012-10-13 06:37:18 -07:00
cib
9c55f8c8ac
Ported BS12 medbots.
2012-10-13 06:33:05 -07:00
cib
8dc75dfa3c
Fixed the problem where :h would be holosay even for cyborgs.
2012-10-13 05:46:09 -07:00
cib
5a1df1362a
Medical stacks(bandages etc.) now are non-instant again.
2012-10-13 05:45:15 -07:00
Travis Whitehead
5184ca58f5
Roller beds are collapsible and the ChemMaster lets you specify pill/bottle color, once more
2012-10-13 03:44:19 -07:00
Travis Whitehead
524265b872
Fixed Moderator text color in OOC + Mods no longer see admin logs
2012-10-13 03:39:33 -07:00
cib
9ae4bbfdf8
Fixes the say_quote runtime.
2012-10-12 16:15:34 -07:00
cib
c0e0e7d116
Remove the silly examine messages that give away wounds even when under clothing.
2012-10-12 15:47:01 -07:00
cib
c691f76c65
Small bug with engineering cyborg radio channels.
2012-10-12 15:34:40 -07:00
cib
e05b9fa2b6
Fixed a runtime with organ generation.
2012-10-12 15:03:32 -07:00
cib
06d47ea2dd
Cyborgs can now use their respective channel.
2012-10-12 14:56:34 -07:00
cib
32e839f683
More and yet more fixes from the piratepad.
...
- AI laws now default to Nanotrasen laws
- Removed half the random events
- Milk now in chem dispensers
- Hunger rate decreased by half
2012-10-12 14:25:54 -07:00
cib
5ef6399238
Fixed a ton of the issues in http://piratepad.net/9CwFobI4lZ
2012-10-12 13:58:18 -07:00
cib
89263fc9f6
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-10-12 13:19:20 -07:00
cib
8c157bff18
Added missing groin.
2012-10-12 12:36:25 -07:00
Mloc
046348db49
Merge pull request #1744 from CIB/branch
...
Several changes to organs + bugfix
2012-10-12 12:15:57 -07:00
cib
99313f5a94
More fixes to wounds.
...
- Added more wound descriptions
- Wounds now have "bleeding" and "bandaged" in their examine description
2012-10-12 12:08:00 -07:00
cib
0aa3bde885
Fixed the problem where you don't get the game-panel verb.
2012-10-12 11:41:01 -07:00
cib
70740d20c6
Improved the organ and wound system.
...
- Removed a few unnecessary things in organ.take_damage
- Wounds now will open a lot more often, making for fewer but larger wounds
- Natural wound regeneration will use less processing time now by happening less often
2012-10-12 11:38:59 -07:00
cib
fbc903e59c
Added a new surgery system.
2012-10-12 11:09:21 -07:00
Mloc
d4a67a7e66
Merge pull request #1741 from caelaislinn/bs12_with_tgport
...
re-add asay >.>
2012-10-12 09:43:08 -07:00
Mloc
33a3d3cd97
Merge pull request #1738 from CIB/master
...
Dismemberment
2012-10-12 09:42:31 -07:00
Cael_Aislinn
d59dc63fed
re-add asay >.>
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-13 01:37:08 +10:00
Cael_Aislinn
a0c91e200d
re-added missing admin verbs (bans, toggle ooc, msay etc)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-13 00:51:30 +10:00
Cael_Aislinn
3e11992cce
re-added game panel for admins and added zas options, extended postgame restart delay from 25 seconds to 60
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-13 00:01:45 +10:00
Cael_Aislinn
6d4e17ac32
fix for alien species limiter bug
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-12 23:36:10 +10:00
Cael_Aislinn
6fc9aab4f6
some merge fixes
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-12 18:21:50 +10:00
Cael_Aislinn
419247adfe
Merge remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/game/verbs/ooc.dm
code/modules/admin/admin_verbs.dm
code/modules/food/recipes_microwave.dm
html/changelog.html
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-12 17:53:17 +10:00
Cael_Aislinn
33e12ca9d3
readded speech bubbles, tested on humans only. also pre-emptively fixed (?) a bug with alien languages
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-12 17:43:21 +10:00
Cael_Aislinn
39f528e0ce
re-enabled custom event verb
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-12 16:49:59 +10:00
Cael_Aislinn
79ad144e91
fix^2 for mods and admins not being applied correctly, along with the admin/player panel not showing up
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-12 16:39:26 +10:00
Kortgstation@gmail.com
29fe7720ca
Committing my mostly finished away mission.
...
Added a few new corpse types
Simple animals can now open doors
Added a bluespace artillery control machine. Using PA sprites as placeholders until I get real ones.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4847 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-12 06:05:52 +00:00
Cael_Aislinn
fed6625e07
fix for moderators not being loaded correctly
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-12 13:44:23 +10:00
johnsonmt88@gmail.com
e3b3ff836b
The wizard's teleport scroll now only works if the wizard actually has it. Fixes issue 997.
...
I've also moved the teleport scroll define from defines/obj/weapon.dm into scrolls.dm
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4846 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-11 23:07:34 +00:00
giacomand@gmail.com
5eba2eda1d
-Added a new Game Master fun button. It will set the default player OOC colour to whatever the user chooses.
...
http://i.imgur.com/xRM7j.png
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4845 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-11 22:24:08 +00:00
elly1989@rocketmail.com
a640d10307
The icon_state of space turfs is now generated by jumbling up its x y and z coordinates. This means when space turfs get deleted the icon_state doesn't change each time and look stupid.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4844 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-11 21:59:01 +00:00
cib
fb60301594
Revert "Revert's cib's BS12 merge by XSI's orders"
...
This reverts commit a6e7c085ef
2012-10-11 14:31:31 -07:00
Cael_Aislinn
7cd66f0cfd
runtime fix
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-12 01:37:06 +10:00
giacomand@gmail.com
5a93673762
-Larva grow a little faster (an extra growth per life) when on weeds or when breathing in plasma.
...
-Observer following is cancelled when there's no client.
-Made facehuggers/eggs a little smarter. They won't try to go after people with masks covering their mouths (as that kills them), however when they're thrown they will still try to attach to the person.
-Improved alien stats(). You'll be able to see the max plasma and larva will see the escape shuttle.
-Blessing with a fire extinguisher wasn't working because of the volume check. Removed the check.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4842 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-10 19:56:51 +00:00
d_h2005@yahoo.com
4d74a9f252
-Adds cherry seeds to the seed vendor
...
-Adds some recipes for cherries and cherry jelly
-Standardizes the vendor's seed count to 3 for all (though the plants that make you high starting with more seeds than everything else was a humorous commentary).
-New sprites for eggplants/seeds!!!
-Making ambrosia salads removes the toxin from them now.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4841 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-09 21:54:36 +00:00
Kortgstation@gmail.com
67433021a1
Combined the PDA constructor things. My bad.
...
Replaced all the for mob in range show in Syndicate.dm etc with visible_message.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4840 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-09 19:42:57 +00:00
Kortgstation@gmail.com
18608f3ca6
Added Syndicate NPCs/sprites for them. They come in a few varieties, some with shields and swords, some with guns(yes they shoot). They're simple animals, but they drop a corpse landmark when they die, so you can loot them normally.
...
A plea to admins: Dont fucking spawn these everywhere, they're meant to be used as badguys in away missions, not for you to fuck up every round by spawning 70 of them.
Clowns also drop a real (lootable) body on death.
Added new corpse types. Syndicates as well as several civillian jobs.
Added a new area/copied a shuttle icon over into floors as part of work on my map.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4839 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-09 19:22:14 +00:00
Cael_Aislinn
f22948967f
tweaks to game start / admins, fixe for adjacent reaching not working
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-10 00:41:50 +10:00
Cael_Aislinn
773732c609
fix for admins not being applied successfully on round startup, added some resource caching i forgot about before
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-09 23:54:31 +10:00
Cael_Aislinn
6365459bde
additional mergefixes, including tg map updates
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-09 23:22:51 +10:00
Cael_Aislinn
c6916f678d
updated changelog, added new TG notif type to show tg ports
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-09 23:15:28 +10:00
Cael_Aislinn
cccff0881f
Merge remote-tracking branch 'remotes/git-svn' tgstation r4838 into bs12_with_tgport
...
Conflicts:
code/game/gamemodes/events.dm
code/game/gamemodes/events/space_ninja.dm
code/game/machinery/atmo_control.dm
code/game/machinery/doors/firedoor.dm
code/game/machinery/telecomms/broadcaster.dm
code/game/objects/structures/watercloset.dm
code/modules/clothing/glasses/glasses.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/simple_animal/life.dm
code/modules/mob/new_player/new_player.dm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-09 23:07:41 +10:00
Cael_Aislinn
825a7dcbf9
various mergefixes
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-09 22:49:38 +10:00
giacomand@gmail.com
029429ecc2
-Commiting Aran's fix to human examination. Including dead people not showing up as ghosted.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4838 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-09 08:09:34 +00:00
