Iamgoofball
e02566fd2f
Changes Telescience to Projectile Trajectory!
...
Conflicts:
code/modules/telesci/gps.dm
code/modules/telesci/telesci_computer.dm
2013-11-28 17:50:09 +04:00
Mloc
503302dae5
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/implants/implant.dm
code/modules/reagents/Chemistry-Machinery.dm
2013-11-24 23:37:09 +00:00
Mloc
a2fdf79da4
Merge pull request #3972 from Zuhayr/master
...
Fixes #3642
2013-11-24 12:54:06 -08:00
Mloc
bebb826c2b
Merge pull request #3970 from Ccomp5950/hud_fix
...
Hud fix
2013-11-24 06:45:06 -08:00
Mloc
74c6a35f9e
Merge pull request #3969 from Ccomp5950/booze_fix
...
Booze fix
2013-11-24 06:44:04 -08:00
Nanai
7a4f11990c
Holostools/Stool Replacement
...
Fixes issue #3323
Adds in a holostool item, replaces all holodeck stools.
2013-11-23 19:22:05 -05:00
Nanai
a8f1ee6c91
Girder health/laserkill fix
...
Allows girders to be broken by repeated laser shots to stop abuse against laserfire. Also, for actually being able to lase through walls if they're open.
Resolves issue #3796
2013-11-23 18:50:15 -05:00
Zuhayr
185c83b287
Fixes #3642
2013-11-24 09:22:50 +10:30
Zuhayr
dc90ab9eb4
Merge pull request #3964 from Ccomp5950/atmostech_access
...
Bugfix: Atmospherics technicians will now have external_airlock access
2013-11-23 14:47:50 -08:00
Mloc
c5cd3562e3
Merge pull request #3961 from Ccomp5950/loyaltyimplant_fix
...
Bugfix(2126) Traitors still have loyalty implants, admins should be able to remove/disable implants
2013-11-23 04:02:40 -08:00
Nanai
5484163efe
Implant mode changability, explosive variable fix
...
Fixed and upgraded as per Ravensdale's request in #3966
2013-11-23 06:55:12 -05:00
Ccomp5950
9e4e46cf44
Removed soda items from Booze dispenser
2013-11-23 04:49:02 -06:00
Ccomp5950
3b2767cb35
Hud icons will now also update with their usual icons and states
2013-11-23 04:43:45 -06:00
Zuhayr
471c45471e
Fixes #3927
2013-11-23 21:08:52 +10:30
Zuhayr
b476a55b47
Fixes #3967
2013-11-23 20:52:39 +10:30
Zuhayr
bfc5a61da1
Fixes #3966
2013-11-23 20:33:58 +10:30
Ccomp5950
317c562039
Fixed the HUD icons in upper left to show up now.
...
_onclick changes had removed the proc for this.
2013-11-23 03:26:57 -06:00
Nanai
89200e16b7
Computer Update Proc Fix
...
Fixes issue #2486
Resolves atmos computers not updating, adds an update proc to printing.
2013-11-23 03:28:00 -05:00
Ccomp5950
df7c877da7
Space Soda should now show up in the Soda Dispenser
2013-11-23 02:02:14 -06:00
Ccomp5950
3a177a95c4
And fix so Space Cola shows up too.
2013-11-23 01:50:17 -06:00
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
