Commit Graph

11394 Commits

Author SHA1 Message Date
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
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
ee6a69e35d Fixes #3248 2013-11-23 00:57:40 +10:30
Zuhayr
8400c73cc1 Nuke merge. 2013-11-23 00:44:19 +10:30
Zuhayr
507d4feb66 Reverting a half-fix that was put into master instead. 2013-11-23 00:41:25 +10:30
Zuhayr
bf44db3393 Due to total absence of ninja spawn points, using carpspawn directly. 2013-11-23 00:39:43 +10:30
Zuhayr
c8c8e9d078 Removing species restriction on ninja gear. 2013-11-23 00:39:00 +10:30
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
Zuhayr
b2ca9f9ccb Added icon_override var to obj/item. When worn, items with icon_override set will use this DMI instead of the hardcoded clothing DMI to determine on-mob sprite. 2013-11-22 22:51:55 +10:30
Zuhayr
ae0605db42 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-11-22 22:18:44 +10:30
Zuhayr
c5b6d42ed5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-11-22 22:18:32 +10:30
Mloc
4f7f371155 Merge pull request #3950 from comma/dirt
Dirt
2013-11-22 03:45:44 -08:00
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
Zuhayr
caee3a81e2 Adds sprites and skeleton definitions for species-specific Syndicate hardsuits. 2013-11-22 09:52:04 +10:30
Nanai
dd77eae405 Custom Belt Fix
Edited issue with chemicals spawned.
2013-11-21 17:34:12 -05:00
Chinsky
791b1c0bda Merge branch 'bygex' of https://github.com/Carn/Baystation12 into bygex
Conflicts:
	baystation12.int
2013-11-22 00:52:47 +04:00
ZekeSulastin
8c28460550 Cloning scanner saves languages in records. 2013-11-21 15:10:03 -05:00
carnie
a9bea16ac8 Bygex - Regex implementation for byond.
Source-code for the dll can be found here under LGPL license:
https://github.com/Carn/bygex
It is merely an interface to boost::regex. It uses perl syntax (non-recursive).

Guidelines for use:
var/datum/regex/Rgx = regex_findall(haystack, regex_expression)
for(var/i=1, i<=Rgx.matches.len, ++i)
    world << Rgx.str(i)

The implementation is different to the one other regex-in-byond library I found. This implementation only returns a string containing the position and length of each match and submatch. This uses far less memory than also passing back the matched strings (especially in large files like dream-maker maps).

Note: Regex indexes begin at 1 (since byond lists begin at 1), unlike traditional regex. If we are using a procedure such as regex_findall(), with 3 sub-expressions, match 1 will be the overall match. Match 2 will be subexpression 1, match 3 will be subexpression 2.... Match 5 will be the overall match of the next match...and so on. To ease use, there is /datum/regex/var/anchors which is a numerical value which can be used inside loops like so:

for(var/i=1, i<=Rgx.matches.len, i+=Rgx.anchors)
    world << Rgx.str(i+1)
This will print the first submatch of each match to world.
2013-11-21 18:54:01 +00:00
Jim "Apples"
f1ce28b7fe Merge pull request #3951 from Ccomp5950/custom_item_creation
Custom Item Request
2013-11-21 07:23:39 -08:00
Ccomp5950
69dbec4920 Custom Item Request
Confirmed with Apple that this was acceptable.
2013-11-21 09:08:30 -06:00
Chinsky
65a9bf6e4b Merge pull request #3930 from Higgin/dev
Changes to how projectiles work: take two!
2013-11-21 02:23:46 -08:00
Chinsky
c50c401a85 Walking on tile makes it dirty. Takes 40 times for mob to enter tile for dirt overlay to appear.
Mopping resets dirtiness level.
2013-11-21 13:46:16 +04:00
Chinsky
48150acc5a Removed earrape 2013-11-21 12:21:50 +04:00