Zuhayr
fa57b76f25
Merge pull request #3965 from jack-fractal/dev
...
Mask of Nar'Sie - 1.0
2013-11-24 20:57:04 -08:00
DJSnapshot
950836c05b
Merge pull request #3974 from Ccomp5950/demonblood_runtime
...
Fixed a runtime issue with demonsblood.
2013-11-24 16:21:37 -08:00
Ccomp5950
f7dd1b69aa
Runtime fix:
...
A traitor panel used on a player-monkey would runtime due to the loyalty implant fix.
We ignore loyalty implants in monkeys, monkeys don't even know what Nanotrasen is, the nanobots probably don't even know what to do with a monkey.
2013-11-24 17:52:26 -06: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
Ccomp5950
cc5418b3cd
Requested removal.
...
Seth Sealis - Gray Coat
Ashley Rifler - Purple Glove
http://baystation12.net/forums/viewtopic.php?f=33&t=9097
2013-11-24 16:57:18 -06:00
Ccomp5950
e8157e36f8
Custom Item Code: Sakura Hokkaido's Kimono (say that 3 times fast)
2013-11-24 16:51:30 -06:00
Ccomp5950
20b803b808
Custom Items Code: Yuri's Flask and Mai Yang's dres.
2013-11-24 16:28:48 -06:00
jack-fractal
39542c7760
- removing 'colon' use for proc calls. Generally a bad idea.
...
- adding a check for being silenced to use runes
- adding extra slashes in front of the mask definition
- re-adding the autotransfer.dm file to the include list
2013-11-24 16:13:28 -05: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
Ccomp5950
72b762db53
Can no longer commit suicide with a lasertag gun.
...
And you will feel silly for even making the attempt.
2013-11-23 21:51:15 -06:00
Ccomp5950
e684b69741
Fixed a runtime issue with demonsblood. Was causing runtimes because data was inheriting the bloods data var (which is a list).
...
The drink will still maintain it's reagents and data vars but when ingested and procesed the blood is ignored.
Downsides, you can't get sick from ingesting blood in a drink (which..you shouldn't anywho)
Possible future updates: since blood is an amnetic substance make the person have nausia for ingesting it if quantities are high
2013-11-23 20:21:51 -06: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
Jeremy Liberman
7e22046b1e
Add Cash Bag. Works like Plant Bag but for cash/coins
2013-11-23 17:22:01 -06:00
Jeremy Liberman
6bd00eb561
Emag ATMs to drop money
2013-11-23 16:59:30 -06: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
jack-fractal
ce18d47778
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
baystation12.int
code/controllers/verbs.dm
2013-11-23 11:58:50 -05: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
jack-fractal
4ed7c79fcc
- making sure to add the viewpoint properly to roundstart cultists.
...
- there are way too many ways to make someone a cultist...
2013-11-23 02:20:19 -05:00
jack-fractal
4f44d0fd9b
Removing world spam and viewport adding using the equipcultists proc.
2013-11-23 02:01:40 -05: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
6e2aa2e28a
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze
2013-11-23 13:21:24 +10:30
Zuhayr
f359919623
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2013-11-23 13:21:11 +10:30
Zuhayr
85661195bc
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-11-23 13:20:15 +10:30
Zuhayr
740117fa2d
Merge pull request #3954 from comma/bygex
...
Bygex by Carnie
2013-11-22 17:57:49 -08:00
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
jack-fractal
5df2797b86
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
baystation12.int
2013-11-22 20:30:23 -05: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
jack-fractal
3eb8d1c2b9
- lots of debugging
...
- modifying how runes are called to use reflection
- adding highlander code to make sure that there can only be one mask
- adding Spread Shadows spell
- adding cult admin investigation log
- adding mask icon
2013-11-22 20:09:24 -05: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
Mloc
05aa46bbca
Merge pull request #3955 from Nanai/dev
...
Custom Belt Fix
2013-11-22 12:04:09 -08:00
