Commit Graph

9304 Commits

Author SHA1 Message Date
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
Ater Ignis 20bdba6c67 all-intents-intent-button
shows all possible intents on intent button and allows choosing needed one directly, without scrolling them all
2012-11-10 14:19:02 +04:00
Ater Ignis 8b71b7d106 updated DNA code to have more mutations 2012-11-10 14:12:25 +04: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 0b3ca8d0a6 Fixes Issue 1082 - 'Orange' shoes dyed still being chained by handcuffs.
Washing machine code makes me cry, I will rewrite that... Soon(TM)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5028 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-08 05:51:20 +00: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
d_h2005@yahoo.com 698f86152c Shield generator walls will no longer vanish when blown up. Instead, the walls will persist and the shield generators will take a hit to their stored power. Fixes issue 1070.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5020 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-06 22:24:54 +00: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
Chinsky a02a337fed Added option to call crew transfer to Comms computers. 2012-11-06 22:38:02 +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
giacomand@gmail.com 154f8229cd -A bot's setting can be tweaked by AIs now.
-Updated the changelog with a feature I forgot to mention.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5007 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-05 08:09:32 +00:00
baloh.matevz a7ec1b869f - Combined two copy-pasted procs into one in space ninja code.
- Added a confirm message for space ninjas. They have to hit 'yes' to confirm within 30s to actually spawn.
- Fixes issue 904.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5005 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-05 07:35:42 +00: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
Chinsky 6256200c1a Added ability to clip photos to clipboards.
Added ability to view photos from clipboards and folders.
2012-11-04 21:03:17 +04:00
Chinsky 22545ebb9c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-04 19:20:22 +04:00
headswe 1ab78f1ef9 Merge pull request #1873 from caelaislinn/bs12_with_tgport
retrack detective files
2012-11-04 07:19:25 -08:00
Cael_Aislinn 12d4aed285 added anomaly /area icon_state, fixed anomaly research outpost and shuttle, added cycling airlocks to engineering singularity access (slight reshuffle of engineering areas)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-11-04 16:42:32 +10:00
Chinsky 45a6cd0d00 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-04 10:03:45 +04:00
Chinsky d42f601308 Ported photo system. 2012-11-04 09:53:38 +04:00
Hawk-v3 93ca65d2ca Merge pull request #1858 from caelaislinn/bs12_with_tgport
Miscellaneous things
2012-11-03 09:04:59 -07:00
giacomand@gmail.com b00c0c2a9f -New sprites APC sprites by TankNut!
-New wraith sprites by TankNut!
-Decreased flare duration, again(!)
-Made a based interact proc and changed the updateDialog to call that instead of attack_hand. This caused issues with the APC and getting the power cell out of it. I then changed all machines that had their own defined proc (that was everywhere)


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5001 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-03 14:45:29 +00:00
giacomand@gmail.com 4c1136b48f -Fixed Issue 864 (Moving lights from your inventory to your hand causes lumiosity to be subtracted from your mob.)
Item's attack_hand proc wasn't calling the item to be picked up if it was in your inventory, which meant that the lights couldn't update properly. By calling pickup, even if the mob was taking it from their own inventory, I was able to get the lights to update properly. I've tested all items that used /pickup and they all worked correctly, apart from tray which never worked correctly as I then tested it on the online servers. I'll create an issue report for that later.

-The crew monitor will now detect mobs that are inside a content of an object, such as a locker. I also made it so that it only detected mobs on the same z level as the computer itself, so people on the away missions and what not will not be able to see the crew member's on the station.

-Updated the changelog about my last commit, before this one.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4999 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-03 12:35:22 +00:00
Hawk-v3 cd641c3370 Merge pull request #1861 from AterIgnis/detonators
Detonators
2012-11-03 04:31:16 -07:00
Chinsky d56b400b0c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-03 12:03:46 +04:00
giacomand@gmail.com 9294b283b6 -Added WJohnston's new laser-proof armour sprite.
-Reduced queen healing rate to 5. The increased max health should be enough.
-Aliens can clear hatched eggs by clicking on it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4998 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-03 07:39:10 +00:00
Cael_Aislinn 4a5a80f3bb fixed alien whitelist (wasn't being loaded at round start), removed myself from admins
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-11-03 16:57:59 +10:00
Chinsky 4e6a77edb4 Stopped cig butts falling out of mouths. 2012-11-03 10:37:30 +04:00