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
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
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
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
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
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
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
Iamgoofball
43bde0598d
Uncommented the dressing up corgi code! Have fun replacing the condom! Also adds a player requested item.
...
http://baystation12.net/forums/viewtopic.php?f=33&t=9120 Rainbow Belt
2013-11-20 18:10:14 -08:00
Higgin
d72d845cba
Fix to fix a fix that needs fixing.
2013-11-20 16:00:07 -08:00
Ccomp5950
7d545437a3
Spelling mistake.
...
Commit_Count++
2013-11-20 17:49:11 -06:00
Iamgoofball
ac4e42bb2a
After a very prolonged set of Syndicate budget cuts, Detomatix PDA carts are no longer buildable
2013-11-20 15:29:33 -08: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
Iamgoofball
7dcb47ec2a
R.I.P H.O.N.KBlaster 9000. You died as you lived. Hidden in a crate.
2013-11-20 15:19:24 -08: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
Iamgoofball
b024087119
Merge branch 'smallchanges' of https://github.com/Iamgoofball/Baystation12 into smallchanges
...
Conflicts:
code/modules/research/designs.dm
2013-11-20 15:00:36 -08:00
Iamgoofball
e36f0c3fac
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into smallchanges
...
Conflicts:
code/modules/research/designs.dm
2013-11-20 14:59:33 -08:00
Iamgoofball
7fa80e799a
made head PDA carts be in lockboxes. Added Abandoned Crates!
2013-11-20 14:57:22 -08:00