Commit Graph

4401 Commits

Author SHA1 Message Date
SkyMarshal
2fece529af Fixed a compile warning, reverted my grenade changes as requested by mangled, readded unsecuring-of-the-AI-with-a-wrench and the associated traitor objective checks, tweaked my previous commit re:adminhelps. 2012-11-13 22:46:43 -07:00
elly1989@rocketmail.com
50fbfa0c35 As per SoS' request, added a config option ALLOW_ADMIN_OOCCOLOR. If commented out, admins won't be able to have their own personal ooc colours (it will use the default dark red colour).
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5056 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-13 19:28:31 +00:00
cib
422ec63bfc Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/human.dm
2012-11-13 19:01:03 +01:00
cib
c7b8bda2af Merge branch 'master' of github.com:CIB/Baystation12 2012-11-13 17:14:58 +01:00
cib
3dc4a56554 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-11-13 15:39:38 +01:00
aranclanos@hotmail.com
dee7b74a45 -Changed turf creations, merging everything to only one proc
-Fixes Issue 1085 - Artificers creating turfs with buggy lighting
-Spells now will use the proper proc to create turfs

Due to the amount of files changed, this is just the 'part one'. The merging in turf.dm is not finished, mineral walls and buildmode are still using the old system. The creation of turfs on the game panel is not using the proper procs yet. Stay tuned for this changes, but now, sleep.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5054 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-13 13:39:00 +00:00
CIB
74c5235c9d Added back the "unknown substance" message 2012-11-13 14:11:03 +01:00
Kortgstation@gmail.com
7103cbfac0 Removed the alertness level thing for carp/hostile mobs in general. Neat idea in theory, but in practice it just meant people could run up and beat carp to death before they'd even enter their hostile state. Bears still have it though.
Carp are slightly faster (in testing, I walked away from one as a borg, this seems a bit silly). This might not work well in practice though what with lag on a live server, so I'm guessing I might have to change this back.

Carp/syndicate also keep chasing their target as long as they're within 10 tiles, to compensate for them being slower than humans.

Removed the restriction on debraining changelings, this was a terrible "fix" to half-changelings and just lets you metagame.

Added a mineral var (metal) to floors to stop runtimes when you hit them with mining tools.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5052 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-13 03:22:07 +00:00
sieve32@gmail.com
ae3b76879e Welp, missed a use() for mineral walls, specifically clown ones. Not much else to say really.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5050 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-13 02:31:56 +00:00
giacomand@gmail.com
7955d348d8 Lots of bugs fixed for advance diseases.
Fixed advance diseases using the same reference in mobs.
Fixed advance diseases referencing other advance diseases' symptoms, instead of just copying it.

I tested it more thoroughly this time and I can't find any issues but if you do please add them to the bug tracker and or contact me on #coderbus.

Added a new reaction which will remove symptoms from a disease. Needs blood and synaptizine.
Added a new symptom, shivering will make you cold.

Tweaked and balanced some symptoms.

Removed the "flex" emote that hulks will do randomly.
Reduced the change to speak for hulks and brain damaged mobs. ( 7% -> 3% chance)

Please let me know if anything is out of place or wrong.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5048 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-13 00:28:07 +00:00
Chinsky
8e60315b11 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2012-11-13 04:02:26 +04:00
Chinsky
bd20233c35 Added color coding to health analyzers, much like crew monitors.
Numbers for each damage will be written in corresponding color, bolded if above 50.
2012-11-13 01:56:31 +04:00
Ispil
814a670572 Fix to issue #1887. 2012-11-12 12:29:55 -07:00
cib
e92cecdefe Added basic germ code.
This will only trigger in surgery for now - That is when you cut someone open in surgery, you'd better wash your hands before, or otherwise you'll get infected wounds.
2012-11-12 12:51:28 +01:00
sieve32@gmail.com
77980e5225 -Cyborg frames can no longer be turned into reinforced ones if they already have parts on them
Fixes Issue 1055
-Made a 'catch-all' for emotes, where any 's's at the end of an emote command(Unless they have a '_' in front of them) will be cut off, so things like 'bow' and 'bows' would be interchangeable, and so on.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5043 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-12 00:08:40 +00:00
SkyMarshal
ecdb9ab118 Fixed the sillies marked with "skytodo". Removed ONESIZEFITSALL flag as we removed fatness, replaced it with PLASMAGUARD flag as that is what we were using the value as previously. Firedoors should no longer be derpy. The remaining "skytodo"s are places where I have no idea what the fuck you wanted or no idea what the fuck needed done with it. 2012-11-11 14:33:33 -07:00
cib
fb295ee0cf Balancing for genetics side-effects:
- The knockdown is now much shorter, meaning a geneticist may be able to give themselves the cure in time.
- Reduced radiation created from syringes, since there are other side-effects now.
2012-11-11 18:51:02 +01:00
cib
eb49378575 Added genetic side effects. 2012-11-11 18:15:12 +01:00
cib
2522d5e7f1 Fixed up autoinjectors and added health analyzer to regular first aid. 2012-11-11 11:45:24 +01:00
Kortgstation@gmail.com
ab4c92e066 Using summon guns gives a message to the the user to confirm it working.
Added a new borg upgrade module which requires illegal tech and combat tech to make. It allows you to give them their emagged equipment without fucking with their laws.

New LMG by Ausops (both sprites and code). Right now appears only in Summon Guns, but may appear elsewhere in time.

Grilles now have a bullet act, so they no longer magically absorb infinite bullets.

Updated changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5037 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-11 07:43:49 +00:00
Whitellama
421e41f3e2 Ported knocking on windows 2012-11-10 19:07:32 -08:00
Connor Reynolds
2f5621fedb Issue #1818 - Freeform Module broken again
-Think- I fixed it. It shouldn't just stop the user after they enter the
law priority number now. Should work properly.
2012-11-10 16:53:39 +00:00
MrYeti
9f16527552 Update code/game/objects/items/weapons/storage/belt.dm 2012-11-09 19:36:12 -05:00
MrYeti
ea1d27a6a2 Update code/game/objects/items/weapons/storage/belt.dm 2012-11-09 19:26:47 -05:00
Ater Ignis
116b17e2be internal explosions
if some explosive reaction occurs - it firstly tries to explode container, next the surroundings
if container is alive - it cuts half of explosion power, if it is dead in process - cut an half again
2012-11-09 20:24:44 +04:00
Hawk-v3
3cfb201846 Merge pull request #1839 from AterIgnis/ed209
ED209 not showing on remote-control chip of security PDA
2012-11-09 07:42:09 -08:00
Hawk-v3
a114c79aca Merge pull request #1894 from comma/master
Limb surgery
2012-11-09 06:52:49 -08:00
Hawk-v3
86f3622d1c Merge pull request #1893 from SniperYeti/master
Security Belt Modifications
2012-11-09 06:50:25 -08:00
Hawk-v3
c4c065dfba Merge pull request #1885 from caelaislinn/bs12_with_tgport
remaining map updates, plus misc
2012-11-09 06:49:39 -08:00
Chinsky
18f56f4a38 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-09 14:32:49 +04:00
Chinsky
2bf2d11730 Merge branch 'limbsurgery' 2012-11-09 14:32:22 +04:00
MrYeti
6a129ea312 Update code/game/objects/items/weapons/storage/belt.dm
Added tasers and stun baton to the security belt and now has 7 slots.
2012-11-08 22:31:32 -05:00
SkyMarshal
9b3389145e Fixed some runtimes with mulebots, the security computer, and the medical computer, as well as readded the nice prompt the cloner gives to ghosts when they are being cloned. Fixed an odd compile error. 2012-11-08 14:49:01 -07:00
Chinsky
ef6d50b5c4 Added logging of status screen text change. 2012-11-08 15:44:34 +04:00
aranclanos@hotmail.com
437841d8b4 Fixes Issue 1081 - Not being able to analyze tanks with PDA/analyzers. The tank attackby proc was overridden by the one tank bombs.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5025 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-07 21:08:03 +00:00
Chinsky
47db4eded3 Can attach limbs now. No preparations needed yet. 2012-11-07 20:01:55 +04:00
Cael_Aislinn
d6b249b945 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-11-07 15:48:10 +10:00
aranclanos@hotmail.com
9fcf5b4a63 Fixes Issue 1071 - Kitchen trays doing crazy stuff when a person switch it between their hands.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5017 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-06 19:33:35 +00:00
Chinsky
9dc9198237 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-06 22:41:19 +04:00
aranclanos@hotmail.com
20c1955163 Fixes Issue 1078 - Wood sheets deleting girders
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5016 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-06 18:10:31 +00:00
Chinsky
1a02f2ff1c Proted instabeams for energy projectiles.
Also buffed laser damage to pre-merge.
2012-11-06 20:35:48 +04:00
Cael_Aislinn
0d77854520 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-11-06 23:04:47 +10:00
Chinsky
5276c85664 medical belts can hold gloves and mask again. 2012-11-06 14:11:31 +04:00
Chinsky
9a4535be69 Added logging of thrower for stunbatons. 2012-11-06 13:29:01 +04:00
SkyMarshal
f66572b6a7 Merge pull request #1879 from comma/master
Photos and flying batons
2012-11-06 00:26:00 -08:00
aranclanos@hotmail.com
beb53e2337 Fixes Issue 1073 - Mining ore satchel crashing clients.
It's a small and crappy bugfix, the storage code of the satchel is awful and needs to be re-done.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5010 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-06 01:34:21 +00:00
Cael_Aislinn
b72b378f1e cigars and pipes can be lit by means other than matches
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-11-05 22:24:45 +10:00
Chinsky
5d62b98c18 Added 50% chance of thrown baton to stun mob 2012-11-05 14:46:00 +04:00
baloh.matevz
8f0ae22884 - Reverted the size reduction from r4996.
This is simply not acceptable:
- http://www.kamletos.si/screen%20overlay%20reduced%20size.png
- http://www.kamletos.si/screen%20overlay%20reduced%20size2.png- Made being in an area with extremely low pressure cause some damage (2 per tick)
- Reduced the amounts of oxy damage per tick from 1/ 2 / 4 to 0.5 / 1.5 / 3, depending on your body temperature.
- Reduced the maximum amount of high pressure damage per tick from 7 to 4. Slightly reduced the damage coefficient for pressure damage. This is to prevent insta-kills in high pressure areas. I still can't believe poly originally set it to 20 per tick... 
- Added a maximum amount to how much your body temperature can change in each tick. It can go up or down by, at most, 30K per tick.
- Space suits and the captain's armor now protect against pressure damage
- Fixed some more of poly's awful code. The STOPSPRESSUREDMAGE flag now defines whether you take damage or not. You still need to have both a helmet and suit with that flag on to be fully protected from pressure damage. This will make the pressure damage indicator actually show what kind of pressure is affecting you and not just pretend like you're not taking damage, even if you are, while in a space suit:

//Poly code<TM>
if(istype(wear_suit, /obj/item/clothing/suit/space)||istype(wear_suit, /obj/item/clothing/suit/armor/captain))
--pressure.icon_state = "pressure0"
else
--...

- Standardized /obj/item/examine().
- Added the important stuff to the changelog.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5004 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-05 05:59:50 +00:00
SkyMarshal
70c2fb231d Fixed Security HUD issues, reinstated old grenade behavior, de-nerfed Polyacid 2012-11-04 16:17:35 -07:00