giacomand@gmail.com
6d63d6d4e0
-Got the disease types switched around. I switched them back. Fixes Issue 1213
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5419 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-29 12:35:56 +00:00
giacomand@gmail.com
7af60a7fb5
-Changed the powernet nodes list to be a dictionary list (associative list, hashtable, etc..)
...
-Added a solars_list. The sun will use this list instead of the machines list. I made a proc which decided on whether to use this list or the powernet nodes list depending on what is smallest. I replaced some loops to use this proc.
-The sun will reference this list for debugging purposes. The sun will also remove solar equipment in the list which are not connected to a powernet.
-Cut down on some duplicated code.
-Fixed an issue with solar panels not updating their direction correctly.
-Changed the proc updateicon()'s name to update_icon()
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5418 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-29 07:24:42 +00:00
Cael_Aislinn
0e9d6c163d
runtime fix. the original code here was intended to make projectiles work with autopsy, but instead it just caused runtimes and made some mobs invulnerable
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-29 14:00:46 +10:00
ericgfwong@hotmail.com
7408d897de
Added a camera to library so the librarian can play reporter if he wanted to.
...
Added more swag to Vacant office so it'd be more unique from the other construction areas.
Changed photo item_states to look like paper.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5415 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-29 03:43:23 +00:00
Cael_Aislinn
c270fdb2ba
compile and misc other fixes
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-29 13:23:43 +10:00
Cael_Aislinn
c0102cf13e
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/defines/procs/global_lists.dm
code/game/gamemodes/events.dm
code/game/gamemodes/events/space_ninja.dm
code/game/mecha/working/ripley.dm
code/modules/mob/living/carbon/human/human_attackalien.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/new_player/preferences.dm
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/mask.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-29 13:06:03 +10:00
ericgfwong@hotmail.com
82f31bc6e2
-Fixed up floor arrow icons so that they're not just the same one rotated around.
...
-Made chemistry a bit less reinforced.
-Moved more engineering equipment to access_engine_equip.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5413 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-29 00:14:01 +00:00
GauHelldragon
50489f28ed
Fixes cyborg display when items are disabled due to power.
...
Previously the hud would not be updated when power drops below 100 and items are disabled.
2012-12-28 13:51:09 -08:00
GauHelldragon
a116225433
Fixes cyborg HUDs security and medical HUDs
...
The images now go away when the module isn't active
2012-12-28 13:37:17 -08:00
Cael_Aislinn
31349fb7d3
Merge branch 'incremental_tg' r5067 into bs12_with_tgport
...
removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates)
Conflicts:
baystation12.dme
code/__HELPERS/type2type.dm
code/controllers/configuration.dm
code/datums/datumvars.dm
code/datums/helper_datums/getrev.dm
code/defines/obj.dm
code/game/gamemodes/events/black_hole.dm
code/game/gamemodes/events/space_ninja.dm
code/game/gamemodes/wizard/rightandwrong.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/job.dm
code/game/jobs/job_controller.dm
code/game/machinery/bots/medbot.dm
code/game/machinery/computer/card.dm
code/game/machinery/telecomms/traffic_control.dm
code/game/machinery/turrets.dm
code/game/machinery/wishgranter.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/devices/uplinks.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/turfs/turf.dm
code/game/verbs/ooc.dm
code/global.dm
code/modules/admin/IsBanned.dm
code/modules/admin/admin.dm
code/modules/admin/admin_memo.dm
code/modules/admin/admin_verbs.dm
code/modules/admin/holder2.dm
code/modules/admin/player_panel.dm
code/modules/admin/verbs/adminpm.dm
code/modules/admin/verbs/diagnostics.dm
code/modules/assembly/igniter.dm
code/modules/client/client defines.dm
code/modules/client/client procs.dm
code/modules/clothing/spacesuits/miscellaneous.dm
code/modules/clothing/suits/armor.dm
code/modules/clothing/suits/jobs.dm
code/modules/mining/mine_turfs.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/living.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/new_player/new_player.dm
code/modules/mob/new_player/preferences.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/photocopier.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/modules/reagents/Chemistry-Machinery.dm
code/setup.dm
code/stylesheet.dm
code/world.dm
config/admins.txt
config/config.txt
html/changelog.html
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/suit.dmi
icons/obj/clothing/suits.dmi
icons/turf/areas.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-28 14:13:11 +10:00
Cael_Aislinn
e6c70937e5
Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/__HELPERS/game.dm
code/__HELPERS/type2type.dm
code/datums/helper_datums/getrev.dm
code/game/atoms.dm
code/game/gamemodes/events.dm
code/game/machinery/atmo_control.dm
code/game/machinery/atmoalter/area_atmos_computer.dm
code/game/machinery/computer/HolodeckControl.dm
code/game/machinery/computer/atmos_alert.dm
code/game/machinery/computer/card.dm
code/game/machinery/computer/cloning.dm
code/game/machinery/computer/computer.dm
code/game/machinery/computer/pod.dm
code/game/machinery/computer/prisoner.dm
code/game/machinery/computer/syndicate_shuttle.dm
code/game/machinery/newscaster.dm
code/game/machinery/spaceheater.dm
code/game/machinery/telecomms/broadcaster.dm
code/game/machinery/telecomms/logbrowser.dm
code/game/machinery/telecomms/machine_interactions.dm
code/game/machinery/telecomms/telemonitor.dm
code/game/machinery/telecomms/traffic_control.dm
code/game/machinery/wishgranter.dm
code/game/objects/items/devices/uplinks.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/objs.dm
code/modules/DetectiveWork/detective_work.dm
code/modules/admin/IsBanned.dm
code/modules/admin/admin.dm
code/modules/admin/verbs/adminsay.dm
code/modules/admin/verbs/getlogs.dm
code/modules/awaymissions/zlevel.dm
code/modules/client/client procs.dm
code/modules/clothing/masks/miscellaneous.dm
code/modules/clothing/spacesuits/miscellaneous.dm
code/modules/flufftext/TextFilters.dm
code/modules/mining/machine_processing.dm
code/modules/mining/machine_stacking.dm
code/modules/mining/mine_items.dm
code/modules/mining/mint.dm
code/modules/mining/satchel_ore_boxdm.dm
code/modules/mob/living/carbon/monkey/life.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
code/modules/mob/mob.dm
code/modules/paperwork/filingcabinet.dm
code/modules/paperwork/photocopier.dm
code/modules/power/gravitygenerator.dm
html/changelog.html
icons/mob/head.dmi
icons/mob/human_face.dmi
icons/mob/mask.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/masks.dmi
icons/obj/clothing/suits.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-28 01:07:36 +10:00
johnsonmt88@gmail.com
d4dc5ae070
Moved var/force from /obj/item to /obj so that everything gets it, including structures and machines that get tossed around using Telekenesis. The default force is still 0. This should finally put a stop to a large number of runtimes.
...
Runtime fix for being hit by something without there being a usr. This was most likely due to explosions or possibly mass drivers.
Runtime fix for simple animals using department channels. Only parrots can use them now as they are the only simple animal with the 'ears' variable.
Runtime fix for the mech's energy relay process() when there is no battery in the mech.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5405 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-27 02:08:41 +00:00
johnsonmt88@gmail.com
08e2733c0c
Commit for lpeters:
...
Prevents you from entering the disposal chute from any direction except that in which it is facing. Fixes issue 918.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5403 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-26 19:32:22 +00:00
johnsonmt88@gmail.com
7d7aae0334
Some fixes/changes to Poly:
...
- Poly will no longer perch on closets/crates.
- Poly should now stop picking up items that it has already collected on its perch.
- Poly should now stop picking up the wrong item. Meaning if it 'looks in the pen's direction and takes flight' it'll grab that pen and not a bruisepack.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5402 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-26 02:56:59 +00:00
cib
03b52e77e6
Fix two compile errors.
2012-12-24 21:07:04 +01:00
giacomand@gmail.com
3e24586d6b
-Work done on facehuggers to stop them from being buggy if they're sterile or in a bag. Added icon sprites for inactive facehuggers when they're on a person, meaning they won't turn invisible.
...
Fixes Issue 1052
Fixes Issue 1065
-Added a world limit for blueprints naming areas.
-Fixed a wrongfully named research design.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5394 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-24 19:56:20 +00:00
cib
55c1ec2300
Added a display of active players in a job for latejoin.
2012-12-24 20:32:28 +01:00
cib
c5fb6aaf60
Low blood levels now actually make your nutrition drop.
...
This'll help make people low on blood eat something.
2012-12-24 20:20:15 +01:00
cib
53e500188b
Fixes to the IV drip.
2012-12-24 19:09:45 +01:00
cib
d581ebe767
IV drips now can take blood as well as give it.
...
This makes blood donations much easier.
2012-12-24 18:25:48 +01:00
giacomand@gmail.com
e9fd2037d2
-Committed lpeters's patch which Fixes Issue 1189. http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=11549
...
-Made the shower not require power.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5391 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-24 01:38:36 +00:00
giacomand@gmail.com
c06fc96acf
-Committed something I shouldn't as it wasn't ready and I forgot to untick it while committing my last change.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5389 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-24 00:14:44 +00:00
giacomand@gmail.com
cdc4332769
-Should fix machines not depowering correctly. Let me know if you find a machine which should be powered off but isn't.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5388 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-24 00:12:12 +00:00
baloh.matevz
92a2749fb7
Fixes issue 1111. Makes it possible to apply a manual job ban (via the form in the banning panel) for AI, cyborg, pAI and antagonist roles.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5387 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-23 23:56:08 +00:00
giacomand@gmail.com
fc86180f6c
-The Military PDA will not show up on possible PDAs to message but you can reply to the PDA if it sends a message to you.
...
-Changed the exchange rate for plasma to supply points to 2:1
-Admins can now see photos in newscaster channels when using the button in the fun tab.
-Updated changelog.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5383 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-23 20:08:32 +00:00
baloh.matevz
5cebb40123
- Fixed a runtime that happens when you try to add a new admin via the permissions panel. Adding admins through that panel will now work again.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5382 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-23 19:35:20 +00:00
baloh.matevz
b55042e64b
- Added temporary jobbans.
...
Screenshot: http://www.ss13.eu/tempjobban.PNG
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5381 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-23 12:20:11 +00:00
giacomand@gmail.com
a7d2445693
-You can now sell plasma sheets for supply points. Conversion rate is 3 plasma sheets for 1 point. The rate is adjustable.
...
-Permission from Erro to remove the "redeem a mech by colllecting all the toys" feature. Removed the description from the mech toys too.
-Fixed a possible exploit with ghost following to create more than one follow loop.
-Re-added send mob to the player panel.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5377 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-23 01:01:25 +00:00
Hawk-v3
0917269fe3
Merge pull request #2101 from Ravensdale/master
...
Port: Ai cores
2012-12-22 09:29:53 -08:00
Ravensdale
0ec910729c
Porting of old AI cores. Introduces Triumverate, Serithi's TRIBUNAL sprite made public with permission.
2012-12-22 09:25:47 -08:00
baloh.matevz
4ac30972ee
Added a fix in IsBanned() that alters the SQL statement based on whether an ip and computer id was passed into the IsBanned() proc.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5374 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-22 17:24:06 +00:00
cib
c354685bd7
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature
2012-12-22 17:56:02 +01:00
Hawk-v3
70b40dfc6b
Merge pull request #2096 from comma/crates
...
Crates
2012-12-22 08:29:21 -08:00
Hawk-v3
5f77acd30e
Merge pull request #2095 from comma/inspace
...
Inspace
2012-12-22 08:27:42 -08:00
Hawk-v3
9df91430fd
Merge pull request #2097 from comma/surgery
...
Surgery
2012-12-22 08:27:18 -08:00
Hawk-v3
9e96fa8aca
Merge pull request #2099 from Rowtree/master
...
Camp Redacted - My map that cib wanted me to upload
2012-12-22 08:25:15 -08:00
baloh.matevz
77afc4383d
Removed some world << "" debug messages from multichoice polls.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5373 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-22 09:56:10 +00:00
cib
767e9f33cf
Reduced chemical metabolism and effect of chemicals.
...
Most chemicals should now act just as strongly as before, but much more slowly.
2012-12-22 02:51:40 +01:00
cib
5659e14668
Merge branch 'master' of github.com:Baystation12/Baystation12 into feature
2012-12-22 02:25:46 +01:00
ericgfwong@hotmail.com
e7dc7f9f0e
. now works for department radios, in addition to : and #
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5370 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-21 20:44:34 +00:00
giacomand@gmail.com
76a6ef2252
-Cleaned up computers. Fixes Issue 1195
...
-Made computers use idle_power_usage and active_power_usage that it used from the MC.
I'm sure something is likely to break because I removed a lot of snowflake code. I tried to test all the computers with what I can but if you find something odd then please tell me.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5369 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-21 20:38:36 +00:00
d_h2005@yahoo.com
12e8a32eb2
Tiny adjustment for Ikarrus: The alternate HoS jumpsuit is not a subtype of the normal, and therefore counts towards fulfillment of the Steal objective.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5365 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-21 04:28:11 +00:00
Chinsky
6635fc2a83
Merge branch 'master' into inspace
2012-12-21 01:26:02 +04:00
Chinsky
b3580e8265
Merge branch 'master' into surgery
2012-12-21 01:07:36 +04:00
Chinsky
581f2c4db5
Merge branch 'master' into crates
2012-12-21 01:03:20 +04:00
Hawk-v3
a983b72f4d
Merge pull request #2085 from GauHelldragon/master
...
Various fixes
2012-12-20 06:42:15 -08:00
johnsonmt88@gmail.com
17b162d3ba
You can now use # to speak over department channels. (#e Hello now works just like :e Hello)
...
# was the most voted for symbol, despite it being in different places on british keyboard layouts and every other layout.
The old : symbol still works with department channels.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5361 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-19 23:24:57 +00:00
cib
be2466354b
Fixed another mistake with projectile dodge code.
2012-12-19 22:03:04 +01:00
GauHelldragon
980a24079f
Power draining Anomoly negative charge fix
...
fixes issue #2064
2012-12-19 13:00:30 -08:00
cib
84fe7c01af
Fixed two issues with bullet hit chance.
...
- Bullet hit chance was too low at close distance
- Missing wouldn't actually prevent the damage
2012-12-19 21:44:05 +01:00