Commit Graph

11210 Commits

Author SHA1 Message Date
Ccomp5950
ec79e75c0f Fixed nanoUI issues with Watermelon Juice in the Soda Dispenser
Added some if statements so that NanoUI for the booze/soda dispensers isn't /exactly/ like the chemdispenser, mentions glass instead of beaker, and "drinks" instead of chemical.

Also removed my debug messages
2013-11-23 01:43:34 -06:00
Ccomp5950
91c56c6e77 Fixed Booze dispensers and soda dispensers to be able to use glasses instead of beakers.
Typo fix:  Added taquilla back in, it's ID wasn't correct in the reagent list for booze dispenser.

added watermellon juice to the soda machine.

Todo:  Fix NanoUI for these to now mention beakers, and have enough space to list watermellon juice
2013-11-22 21:46:11 -06:00
Zuhayr
abd17deb5b Fixes #3962 2013-11-23 14:02:10 +10:30
Zuhayr
7cc1c93207 Clamps pill numbers between 1 and 20. 2013-11-23 13:47:20 +10:30
Zuhayr
85661195bc Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-11-23 13:20:15 +10:30
Zuhayr
6f5fcb7ecc Merge pull request #3960 from zekesulastin/cloning-language-hack
A more complete fix to #3697 - languages post-clone
2013-11-22 17:31:45 -08:00
Zuhayr
8b1c54823b Merge pull request #3959 from Ccomp5950/blindfold_fix
Bugfix(3937) Blindfolds cause permenent blindness
2013-11-22 17:30:59 -08:00
Zuhayr
6988eef365 Merge pull request #3957 from Ccomp5950/master
Admin request:  Added admin logging to Detomatix cartridge explosions.
2013-11-22 17:30:08 -08:00
Zuhayr
68fb25e21c Merge pull request #3958 from DJSnapshot/hotfix
Fix for reported issue with the transfer_controller causing a runtime error
2013-11-22 17:29:10 -08:00
Ccomp5950
5fb242afc8 Bugfix: Atmospherics technicians will now have external_airlock access
We gave them suits, we never gave them access.

Cleared this already with Raven
2013-11-22 19:00:18 -06:00
Ccomp5950
bcbf02e809 Changed admin message to use the proc that formats for easy Admin-PM of the baddie.
Thanks Kilakk for pointing it out.
2013-11-22 18:36:20 -06:00
Ccomp5950
e00c6ae21e Bugfix: is_loyalty_implanted() now checks to make sure the implant is actually implanted and now in your hand.
implant adding via the traitor panel will also update it's location to be in the players head for autopsy as well as is_loyalty_implanted() reasons.

Thanks Chinsky / alex-gh for the heads up on this.
2013-11-22 12:52:25 -06:00
Zuhayr
f26f64efad Fixes #3643 2013-11-22 23:47:23 +10:30
Zuhayr
ddabdf90f2 Fixes #3842 2013-11-22 23:17:57 +10:30
Zuhayr
f11b964f6c Fixes #3921 2013-11-22 23:10:06 +10:30
Ccomp5950
9ddbc905e9 Bugfix(2126) Traitors still have loyalty implants, admins should be able to remove/disable implants
Added a proc is_loyalty_implanted() that returns 1 if so, and 0 if not.

Added the ability to remove and add loyalty implants from the traitor panel.

Changed the checks on antags to not care if they are section heads, but to instead check for a loyalty implant.

Fixed a minor bug where traitorborgs made through traitor panel was not adding law 0

Adding a loyalty implant to an antagonist through traitor panel will also remove them from being an antag.
2013-11-22 01:12:56 -06:00
Ccomp5950
56a066ecfb Bugfix(3937) Blindfolds cause permenent blindness
Removed BLIND vision flag from the object as that is already handled in mob/living/carbon/human/life.dm

Resolves #3937
2013-11-21 21:35:23 -06:00
ZekeSulastin
252ab1be9a Applies language list to cloned mob. 2013-11-21 22:25:51 -05:00
DJSnapshot
983ca2d5e3 Fix for reported issue with the transfer_controller causing a runtime error. Also included is a debug controller for the transfer_controller 2013-11-21 17:44:31 -08:00
Ccomp5950
3ae79d1e91 Admin request: Added admin logging to Detomatix cartridge explosions instead of just admin_messages. 2013-11-21 18:37:23 -06:00
ZekeSulastin
8c28460550 Cloning scanner saves languages in records. 2013-11-21 15:10:03 -05:00
Ccomp5950
7d545437a3 Spelling mistake.
Commit_Count++
2013-11-20 17:49:11 -06:00
Ccomp5950
d1ca50f384 Bugfix: Yeah variables are case sensitive.
Lesson learned:  Always compile before commit, unless attempting to pad your commit count.
2013-11-20 17:24:39 -06:00
Ccomp5950
34fb26a649 Ravensdale request:
Detomax cartridge use will not create an admin message saying the name/key of the antag that tried to blow up the target, and if it was successful or not.
2013-11-20 17:11:21 -06:00
ZekeSulastin
2a95cdd296 Scalpels also mangle gloves for nonhuman wear. 2013-11-20 17:07:05 -05:00
Chinsky
48c35d0f8f Merge pull request #3938 from Ccomp5950/master
Admin request:  Jobbans for IA and ERT
2013-11-20 10:27:36 -08:00
Ccomp5950
39ed2b7042 Fixed the bug with supply not sending supermatter if only one crate (it was deleting it instead of deleting the process...odd)
Also fixed a bug where if the supermatter is ordered off the supply shuttle it wouldn't produce power (process was deleted while in crate)

supplypacks.dm is just a spelling fix.
2013-11-19 00:49:55 -06:00
Ccomp5950
fc4107e6ec TAB2SPACE of file.
No changes in this commit besides standardizing indentions.
2013-11-19 00:46:27 -06:00
Ccomp5950
457835db38 Admin request: Jobbans for IA and ERT 2013-11-17 18:16:42 -06:00
Nanai
c977a40b3f Adjusted areas for medbay(Surgery, Patient rooms, genetics cloning, breakroom, psych office) so their APCs work.
Adjusted areas for engineering storage to actually function.
2013-11-17 16:19:13 -05:00
Nanai
808653ed12 Map Fixes IV: Areas Rising
Removed the odd locker room area.

Properly edited dorm areas to individual areas UNDER the sleep area so as to properly reap the benefits of being a dorm.

Added a camera to security dorms.

SMES wiring adjustment.
2013-11-17 15:50:55 -05:00
DJSnapshot
9936a9251f Helps to add the actual new file. 2013-11-17 11:55:57 -08:00
DJSnapshot
b75380985e Using a better method to handle autotransfers. Old method was silly. 2013-11-17 11:54:43 -08:00
Nanai
40695f291e Additional SM bugs(hopefully) quashed
Fixed(?) disposal issues.
Hopeful fix of supply packs, commented out the shard until it's fully functional.

Please report any continuing wonkiness I can't reproduce!
2013-11-16 13:58:30 -05:00
Mloc
10cb810464 Merge pull request #3925 from Nanai/master
Event Rebalance!
2013-11-16 09:58:59 -08:00
Nanai
ab06251c32 Event Rebalance!
As per request, events have been rebalanced to be a bit more even and vastly less appendicitis. Event timers have been increased from 15-25 minutes to 20-40 minutes.
2013-11-16 02:09:28 -05:00
Ccomp5950
4ccf7d0a08 Bugfix (3778) Power cells in exosuits have the same amount of power as a highcap cell
Issue:  Mechs are created/spawned with a high-capaciter cell that is named "Power cell" and confuses some of the less bright roboticists and their beards.

Solution:  Shave the roboticist, and also renamed the cell that spawns to properly reflect it's higher capacity.
2013-11-15 22:07:08 -06:00
Chinsky
3aa7f498b3 Merge pull request #3920 from Kilakk/master
Fixes #3886, ATMs no longer log you in automagically
2013-11-15 01:55:29 -08:00
Ccomp5950
734d89c669 BugFix: Cult Ghosts...after a bit of professional advise from chinsky.
Problem:  Cult members can't use the rune to see ghosts, then beat ghosts over the head.  it was being intercepted by _onclick and processed there and only displaying an angry red notice
that you hit that ghost.  Ghost didn't become visible, it disappeared soon after moving off the rune.

Solution:  Made an attackby for ghosts to check when they are being beat up by cultist with books, now they appear.

Minor feature change:  Now if a visible ghost gets hit it will give a different message than the standard "Ghost is pulled through from the other side".
2013-11-15 01:00:25 -06:00
Kilakk
99321389f2 Fixes #3886, ATMs no longer log you in automagically
Silly security level 0 ruined everything
Added a tiny sanity check as well to avoid runtimes
2013-11-14 21:45:25 -05:00
Mloc
955d6d9067 Merge pull request #3909 from comma/master
No nullname ID cards
2013-11-13 14:08:18 -08:00
Michael Johnson
bcd140a691 Made the telesci console a proper NanoUI 2013-11-13 08:01:00 -05:00
Chinsky
8696d4fbd9 No nullname ID cards 2013-11-12 02:10:01 +03:00
LightningIron
b5671e8bd8 Surgery grammar fixes 2013-11-10 13:08:44 -06:00
Iamgoofball
3e02b55386 reduced fizzle chance to 50, it was very common and overrode everything 2013-11-09 22:51:20 -08:00
Iamgoofball
d83c07ca0e Made telescience WORK! 2013-11-09 22:42:54 -08:00
Mloc
6f19999a9c Merge pull request #3897 from comma/organstuff
Minor organ optimizations
2013-11-08 05:44:24 -08:00
Chinsky
d1be0cba0b Healing wounds should properly update damage overlay if needed. 2013-11-08 08:10:50 +04:00
Chinsky
3992888ea6 removed some unneeded icon update calls (haha totally unneeded yeah)
replaced complete regenerate_icons with just body_update in case of dropping limb
2013-11-08 04:34:37 +04:00
DJSnapshot
7665a1a00e Merge pull request #3895 from Baystation12/master
Merge Dev with Master
2013-11-07 16:31:43 -08:00