cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,106 Commits 5 Branches 0 Tags
6afa23a62e4c70a8e35fb011733be1b7715dbaad
Commit Graph

11238 Commits

Author SHA1 Message Date
Jeremy Liberman
6afa23a62e Adds tofurkey and stuffing food items 2013-11-28 03:45:13 -06:00
Chinsky
845a995abe Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	icons/mob/uniform.dmi
 2013-11-27 04:12:42 +04:00
Chinsky
83d1924b83 Commiting SueTheCake's detective things. 
-New set of clothes spawning in the closet.
-Replacement of revolver by semiauto gun, with update to autolathe recipies.
 2013-11-27 04:10:06 +04:00
Zuhayr
aa6744344a Merge pull request #3976 from Ccomp5950/custom_items_buggaloo 
Custom Items.
 2013-11-25 13:47:43 -08:00
Mloc
d8683f2d39 Revert "Merge pull request #3965 from jack-fractal/dev" 
This reverts commit fa57b76f25, reversing
changes made to 40ee2278ed.

Signed-off-by: Mloc <colmohici@gmail.com>
 2013-11-25 11:59:57 +00:00
Zuhayr
fa57b76f25 Merge pull request #3965 from jack-fractal/dev 
Mask of Nar'Sie - 1.0
 2013-11-24 20:57:04 -08: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
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
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