Commit Graph

9456 Commits

Author SHA1 Message Date
cib
1f6231c174 Fixes some more merge issues 2012-08-06 13:48:21 -07:00
cib
9b9d541a25 Fixed response_team.dm indentation. 2012-08-06 13:43:39 -07:00
cib
f13a961a65 Merge branch 'cib' of github.com:CIB/Baystation12
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/organ/organ.dm
	code/setup.dm
2012-08-06 13:36:26 -07:00
cib
2be19a15ba Minor bugfix to new organs. 2012-08-06 13:28:02 -07:00
CIB
fafe55632b Merge pull request #1582 from FireFishie/hat2
Captain's cap is now a hat
2012-08-06 12:52:04 -07:00
cib
0c67bc7439 Restructured the organ wound system.
Wounds are now datums rather than pure text, which means wound descriptions in examine will now always be in line with the actual damage of the mob.
2012-08-06 12:51:18 -07:00
Superxpdude@gmail.com
bb0da3e5b8 Replaced some more placeholder area sprites with proper area sprites. Specifically the Head of Security's office and the prison wing.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4331 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-06 19:31:27 +00:00
Superxpdude@gmail.com
2eee57b6ed Gave the Miscellaneous Research area proper sprites instead of placeholders.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4330 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-06 19:20:04 +00:00
comma
fe41c6ea1e Stops processing metroid's life after it's dead.
Fixes issue #1463

Signed-off-by: comma <krauchinsky@gmail.com>
2012-08-06 21:11:58 +04:00
ericgfwong@hotmail.com
a2ee0a24c3 Fixed Issue 504
-Door controls now check if the bolt wire is cut and if the door is powered

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4326 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-06 17:09:29 +00:00
comma
c9785bbeff Cannot weld strange rocks with unlit welder anymore.
Fixes issue #1454
2012-08-06 19:34:59 +04:00
comma
2e6da1ab7a Surgery changes.
Gameplay-wise:
-Made all messages consistent, no more message about 'beginning' to do something when actually it's done. (Addresses Issue #1540)
-Now to attack patient on table with surgery tool you need to have harm intent (Addresses Issue #1540)
-All surgeries now have delays and begin/finish messages on each step, much like bone surgery.

Code-wise:
-All code handling surgery steps was moved in appropriate procs for each tool, to get rid of one HUGE attack proc.
Now attack proc checks for prereqs for surgery (like masks covering face), checks for targeted zone and calls needed proc.
-Deleted all code that handled messages for when user performs surgery on himself, because that's honest to god dead code. You need to be down to get surgery don on you, and you can't use tools while down. So until something is changed, those messages removed to improve readability of code.
-Added interrupt proc, that handles interruptions during surgery for each tool. For now all types of surgery handled the same, may be implemented differently later.

Signed-off-by: comma <krauchinsky@gmail.com>
2012-08-06 19:07:48 +04:00
giacomand@gmail.com
d897798d5c -Fixed an issue where the NTSL's broadcast function couldn't send it's signal due to the new telecommunication machines.
-Made the telecommunication server and NTSL broadcast more robust so that having a HUB is an option, if someone decides to create their own network.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4325 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-06 14:48:10 +00:00
Cael_Aislinn
f52eb099f7 tweaks, fixes and additions to carp and simple_animals
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-07 00:03:56 +10:00
cib
7be97d0d9f Updated response team fluff 2012-08-06 13:42:31 +02:00
FireFishie
9b4cdb357e Captain's cap is now a hat
-Traded the Captain's cap back for the hat, as the cap is actually not all that sensible
2012-08-06 06:50:31 -04:00
Cael_Aislinn
bc58cbe6a3 fix for announcement bug
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-06 17:21:46 +10:00
ericgfwong@hotmail.com
853433e610 -Fixed exterior virology access button not working
-Increased brightness of light bulbs to 4 (up from 3). This is so I wouldn't have to spam a whole bunch of light bulbs in darker areas to get the same mood it had before the darkness update. And since I don't need them any more, I've removed a bunch of light bulbs I added in in an earlier commit.
-Added a maint door to the Janitor's closet
-Map changes to library and medbay. Thanks, Dingus!
-Updated changelog

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4324 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-06 06:48:39 +00:00
giacomand@gmail.com
b35fb98116 -Fixed a bug where the AI could not repower itself if the APC's equipment was turned off.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4323 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-05 20:41:48 +00:00
Cael_Aislinn
3e6f253cb7 various tweaks to energy fields, energy field artifacts (some outstanding bugs still)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-06 05:13:02 +10:00
elly1989@rocketmail.com
fb600f9bce Ok, part 1 of this huge mind datum fix. I need to run over the next part again because I've made a lot inconsistencies in it. This is sort of all the misc stuff that got tidied up whilst I was trying to get my head around how everything related to eachother.
This part focuses on:
-structuring the way silicon mobs initialise upon login (there was some hideous copypasta in Login() and New() which used spawn() to change the order of the calls so it was all jumbled up. I think I've got it sorted now.
-Borgs var/real_name was not initialising as "Cyborg". Meaning the name checks were kind of borked.
-Ghosts are now deleted at logout if they no longer have a key. This will stop unneeded ghosts being left lying around. It will not delete ghosts with keys assigned (so people can't respawn or anything). Removed all the del(ghost_ref) stuff I could find. Generally movign the key from a ghost should be the last thing you do as the ghost will be deleted by Logout. However I've put it in a spawn() to hopefully avoid coders accisentally using it in a way which causes runtimes.
-Fixed clone-plants spawning dud potato-people left, right and centre. They'll now dump seeds if it fails for whatever reason.
-Cultist and Rev status are removed at mob/living/silicon/Login() rather than having to be called on a special-case basis everywhere. This may not be necessary when this stuff is finished.
-Removed a bunch of :
-Commented mob/living/Login() with the rest of the antag-indicator code from cloning.dm and hydroponics.dm for any coders whom feel brave/suicidal to fix the related issues

Next on the agenda, replacing mob/var/original_name with datum/mind/var/name to fix the ticker runtimes
Then, fixing mind/proc/transfer_to(mob) once and for all. (There are issues with duplicate minds, role updates, inconsistent initialisation etc etc *yawn*

There's probably a few obscure bugs in there somewhere. Might want to hold off on the updates for a bit. Coderbus will likely spot them all by the end of the week.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4322 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-05 15:29:15 +00:00
Cael_Aislinn
136b8e44e3 oops
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-06 00:17:05 +10:00
elly1989@rocketmail.com
0f20e7e635 Sorry to sort-of break the codefreeze but the fact this isn't an option is kinda crappy and somewhat urgent. If it's a problem I will revert it. Sorry.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4321 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-05 13:44:17 +00:00
Cael_Aislinn
d7bd58b8f3 roach remains have a bit more substance now
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-05 21:47:03 +10:00
Cael_Aislinn
52fdda910a mice can crawl through vents and hide under objects
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-05 21:03:16 +10:00
Cael_Aislinn
bece31d819 fix for mouseception naming bug
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-05 20:00:43 +10:00
elly1989@rocketmail.com
fa26585dc5 Fixes an inconsistency with update_icons stuff.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4320 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-05 09:22:10 +00:00
rockdtben@gmail.com
7bb8f31d18 -Reduce some lag in the gas_mixture/share() proc. The two variables only waste CPU cycles doing calculations that are never used.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4319 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-05 02:55:29 +00:00
ericgfwong@hotmail.com
5722add9f2 Transformation stings now works as players expect it to, and can transform living humans (and monkeys). Cost slightly raised, too, to adjust to this buff.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4318 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-04 23:36:09 +00:00
Albert Iordache
27920a6c59 Merge branch 'mechrevert' of https://github.com/Nerezza/Baystation12 into Nerezza-mechrevert
Conflicts:
	code/game/mecha/mecha.dm
2012-08-04 22:48:25 +03:00
mport2004@gmail.com
3847ac46bd At the start of each job selection level, heads will be checked before all other jobs.
What this means is that if you set something like RD and scientist both to Medium, when it comes around to the Level 2 or the Medium preference checks if RD is open you will be placed in the lottery for RD before scientist (or any other non-head job set to Medium).  Unlike the change made in r4296 this one still respects player preferences.  r4296 would ignore all non-head jobs for EVERY level until it found a head before it even began to run the standard selection code.  With this change the older FillHeadPosition is not quite as important and could likely be removed if wanted however it does still help in cases where you would end up with no heads yet someone had a head set above never.

tl;dr The idea of having a head job chosen over a normal job of the same level is good, however the way it was implemented was not due to how it ignored other preferences.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4317 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-04 18:20:20 +00:00
Cael_Aislinn
eaa28099d3 compile fixes, more tweaks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-05 03:52:17 +10:00
Cael_Aislinn
2b2017126a tweaks to simple_animals, carps no longer freeze / require oxy to live (but rapidly burn up from 25+ degree temp), kobolds no longer require oxy to live
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-05 03:13:49 +10:00
Cael_Aislinn
321e8e9e21 uncommented some missing supply datums
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-05 02:21:45 +10:00
ericgfwong@hotmail.com
7fbf079a81 -Readded the changes to Space Station 13 areas.dm that was undone by r4315
-Added a req_access to the new shutter buttons in science

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4316 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-04 15:59:25 +00:00
baloh.matevz
e7efac9ca6 - Fixed r4301 so it actually does what it set out to do.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4315 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-04 14:51:46 +00:00
petethegoat@gmail.com
04e4380508 Fixes issue 557.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4314 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-04 14:49:38 +00:00
giacomand@gmail.com
e0ca2a6bc0 -Fixed issue 540, someone thought that the prison's intercom microphone not working was a bug, which was actually intentional.
-Fixed issue 643, the code will now check that the TKed item's loc is on turf, i.e: not in a locker or in someone's pockets.
-Fixed issue 282, the locker wouldn't pick up the chameleon's dummy because it was an effect and not an item. I added a hacky exception for the chameleon projector. I've also made the starting item something more useful so that people will use it more. Please report any issues you find with this, I'm sure nothing too bad will happen.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4313 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-04 14:35:12 +00:00
Albert Iordache
0fd0f5dbf0 Merge pull request #1571 from caelaislinn/master
compile fixes
2012-08-04 04:03:01 -07:00
Albert Iordache
e685276c91 Merge pull request #1569 from FireFishie/map3
Minor map changes and a changelog
2012-08-04 04:00:04 -07:00
Cael_Aislinn
6d0058a31e fix for contraband >.>, also simple_animals can't buckle themselves in now
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 20:58:53 +10:00
Cael_Aislinn
8d4f6a8efe admins can change the serial number of a rolled up poster to change the poster decal type when applied. note that you'll need to change the name of the rolled up poster to reflect this if you want to avoid confusion
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 20:00:59 +10:00
CIB
429b04149a Merge pull request #1570 from caelaislinn/master
various simple_animal tweaks, fixes and improvements
2012-08-04 02:48:55 -07:00
CIB
e0c67241cf Added cyborg to jobbans for security etc. 2012-08-04 12:41:50 +03:00
Cael_Aislinn
93f864083c doubled zas debug sensitivity, some tweaks to mouse/ghost spawning
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 19:23:40 +10:00
ericgfwong@hotmail.com
e5a2674e3a -Added Armor run to admin tomes
-Resolved Issue 720. Message should now properly tell you who got cult armor
-Resolved Issue 642. Bad indentation caused girders to disappear if you move away while building them.
-Commented out admin messages when monkeys used non-monkey SEs
-Atmos techs given Construction Area access
-Remapped the south end of Med-Sci
--Misc. Research Lab added to science
--Virology moved to be made more isolated
-Updated Changelog

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4312 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-04 07:37:22 +00:00
Cael_Aislinn
2cb704f617 tweaks and fixes to a couple of supply crates
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 16:23:23 +10:00
Cael_Aislinn
714a9b120f compile fix
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 15:56:18 +10:00
Cael_Aislinn
46a450069e - simple_animals can't open doors by default
- alien larvae, mice can hide under mobs
- roaches, mice can hide under various objects
- various tweaks, including flavour and existing mechanics
- fix for ghosts not being able to spawn as mice
- added move delay of half a second to simple_animals (about the same as human walkspeed?)
- simple_animals, when talking, can only understand each other (and mobs with universal_speak)

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 15:47:56 +10:00
Cael_Aislinn
0b14f97af0 hardcap for vermin spawning (30, editable via gameticker) 2012-08-04 15:44:02 +10:00