Commit Graph

8886 Commits

Author SHA1 Message Date
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
a2f4c91e4a Made limbs prepeared for replacement stop hurt. 2012-11-09 18:07:02 +04:00
Chinsky
7a8899cf42 Updated admin revive to work with organs and bloodloss 2012-11-09 18:03:57 +04: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
Chinsky
5043147cfc Added prothesis instll surgery. 2012-11-09 13:22:55 +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
johnsonmt88@gmail.com
4746f20f35 A couple of runtime fixes:
Runtime fix for Poly searching for items (runtime error: Cannot read null.w_class)

Runtime fix for safe lock-picking (runtime error: Cannot read null.len)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5030 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-08 23:25:41 +00: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
elly1989@rocketmail.com
8a3e9ab885 Secrets panel is now available to all admin-datum holders. Each subsection is restricted to specific permissions however.
Adminhelp now loops through all clients in var/list/admins rather than every client in the world.

Both SERVER and FUN can toggle random events on/off.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5029 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-08 17:08:18 +00:00
Cael_Aislinn
6f77899396 should invert SSD to apply to normal disconnects, but not ghosting admins
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-11-08 22:20:34 +10: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
baloh.matevz
c870d5e158 - Prayer visibility now starts on, as it should.
- Fixed pulse rifle, energy sword, blackhole and mob spawning
- Fixed 'reload admins' not properly updating the 'admins' list, which made adminwho fail, along with some other things.
- Fixed a bug, which prevented admin from even being loaded properly in some circumstances, in the database admin system.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5027 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-07 23:49:54 +00:00
elly1989@rocketmail.com
11ced13b3d Reverts r5012
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5026 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-07 23:00:38 +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
c55e290d4b updated configs on MLoc's request.
Swapped loading mods and loading admins  in places during worldstart, so former mods will properly adminned.
Fixed paths for custom items.
2012-11-07 20:35:02 +04:00
Chinsky
47db4eded3 Can attach limbs now. No preparations needed yet. 2012-11-07 20:01:55 +04:00
Kreastr
2e8b305ac3 Now gliding_size for pulled objects and mobs is also changed. 2012-11-07 13:13:45 +02:00
Kreastr
484351a200 Adapting glide size formula 2012-11-07 11:51:44 +02:00
aranclanos@hotmail.com
0e589d575c Fixes Issue 1066 - Suits having a wrong blood overlay.
I added a new var for suits, blood_overlay_type.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5024 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-07 09:29:40 +00:00
Kreastr
cf01509f8e Split speed from actual delay time 2012-11-07 11:23:45 +02:00
Kreastr
2a80909a94 Making it work 2012-11-07 11:16:28 +02:00
Kreastr
bd6a7ec86b Merge fixes part2 2012-11-07 11:13:27 +02:00
giacomand@gmail.com
5868952ce0 -Added a check to see if you're on turf before trying to spread a disease to someone.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5023 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-07 08:37:46 +00:00
giacomand@gmail.com
0162968399 -Lot of runtime fixes for advance diseases.
-Added two new symptoms, fever and itching.
-Changed some stats on existing symptoms.
-Emotes sucks so I used visible_message if there was no preset emote.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5021 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-07 08:21:36 +00: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
Kreastr
f82952d347 Fixes 2012-11-07 01:39:56 +02:00
Kreastr
001ea33ce0 Merge branch 'animation'
Merging animation fixes

Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_movement.dm
	config/admins.txt
2012-11-07 01:38:28 +02: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
Kreastr
2deb70a1a9 Some changes. Untested. 2012-11-07 00:08:02 +02:00
aranclanos@hotmail.com
b0d3e70f72 Fixes Issue 1080 - Borg mesons having shadows, making mining as miningborg awful
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5019 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-06 21:06:06 +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
b10b035552 Changed Command Channel color to more visible one. 2012-11-06 21:23:58 +04:00
baloh.matevz
abad9978b2 - Fixed the revision number not showing properly. Hopefully it's fixed for good this time, as it works off of logic, instead of line numbers.
- Standardized the database library code
- Deleted a few unused database related files (karma and forum activation), so they won't get in my way later. They work off of no longer existent database tables.
- Made it so the server maintains a constant connection with the database, which is established on world/New() and never broken, until the server ends. If 5 consecutive database connection attempts result in no connection getting established, the server will not attempt any more connections. Made all existing database connections use the global continuous connections. Currently we need two, as we have two databases, but the old database is going to get moved into the new one.
- Fixed the spaghetti-like report in the permissions panel, which happened when someone had many permissions enabled.
- Added database connection reports to display to dream daemon on server startup.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5015 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-06 17:21:13 +00:00
Chinsky
1a02f2ff1c Proted instabeams for energy projectiles.
Also buffed laser damage to pre-merge.
2012-11-06 20:35:48 +04:00
giacomand@gmail.com
f4a559f183 -Added a check for the target's location when drag and dropping someone into a disposal unit.
-Misc stuff with diseases.
-Forgot to add the .dme so the extra symptoms will be ticked now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5014 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-06 15:02:00 +00: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
4a9c7b82ae Commented out gibbing when torso takes too much damage. Because no one likes when you gib someone by poking knife in their chest enough times. 2012-11-06 16:37:16 +04: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
baloh.matevz
dfa45366b8 - Added a new permission type called 'ADVDEBUG', which contains the debug verbs, which should really not be available to run-of-the-mill admins, but should be available to coders, who can use them properly. (debug-verbs and advanced proc call).
- Moved 'reload admins' into the SERVER permission. It already had a check for R_SERVER when it was run, so it being in the debug list was likely a typo. There should probably be an ADVANCEDADMIN permission type or something, that contains the admin-related tools that you don't want all admins to have access to. A 'game masters only' list of verbs, so to speak.
- Edited admin_ranks.txt and the other dm files accordingly.
- Standardized diagnostics.dm

PS: I really love permission based admin verb assignment. So much easier to work with!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5012 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-06 06:17:57 +00: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
cib
392bdd022f Removed the ability to create vira.
This ability should return when virus2 is ported fully and the machinery is added to the map.

This also fixes a possible exploit where you can supply a fake href and spawn a singularity instead of a virus(luckily it won't be added to the map though, but you can still trigger any New() proc you want)
2012-11-05 19:49:30 +01:00
giacomand@gmail.com
c3c6da1c4a -Optimized free looking more by using associated lists.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5009 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-05 15:46:03 +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