cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 18:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,106 Commits 7 Branches 0 Tags
6afa23a62e4c70a8e35fb011733be1b7715dbaad
Commit Graph

6437 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
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
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
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
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
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
c8c8e9d078 Removing species restriction on ninja gear. 2013-11-23 00:39:00 +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
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
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
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
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
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
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
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
Iamgoofball
ab43cc9cd6 made head PDA carts be in lockboxes. Added Abandoned Crates! 2013-11-20 14:56:49 -08:00
ZekeSulastin
2a95cdd296 Scalpels also mangle gloves for nonhuman wear. 2013-11-20 17:07:05 -05:00
Chinsky
60f644c401 Merge pull request #3941 from Iamgoofball/telesci 
Changes Telescience to Projectile Trajectory!
 2013-11-20 10:32:41 -08:00
Chinsky
4beabc587d Merge pull request #3940 from Ccomp5950/ghost_buff 
AntagHUD's player verbs will now disappear from the players view if disabled by admin or by configuration options.
 2013-11-20 10:32:18 -08: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
Zuhayr
71416e543e Changed diona evolution to use nutrition rather than nutriment. 2013-11-20 18:33:39 +10:30
Zuhayr
249cd0d069 Increased REQUIRE_LIGHT min level to 5, removed burn damage from healing from RAD_ABSORB. 2013-11-20 18:32:00 +10:30
Zuhayr
32b2009c25 Diona will take five times as much damage from plant-B-gone as previously. 2013-11-20 18:26:55 +10:30
Zuhayr
542104478f Commented out the Sec-healing component of sprinkles. 2013-11-20 18:18:55 +10:30
Zuhayr
d1e6094a77 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-11-20 17:50:01 +10:30
Iamgoofball
2be70afe8b changed it so that only syndi-hardsuits only restrict vox 2013-11-19 23:12:41 -08:00
Iamgoofball
06719b5aa9 added a fuck ton of small changes 2013-11-19 23:00:07 -08:00
Iamgoofball
c13f57613c Changes Telescience to Projectile Trajectory! 2013-11-19 19:23:51 -08:00
Ccomp5950
46218e71f1 Bugfix: AntagHUD, need to remove verbs from correct object 2013-11-19 05:59:28 -06:00
Ccomp5950
7be20c0986 AntagHUD's player verbs will now disappear from the players view if disabled by admin or by configuration options. 
Poor guys won't know what they are missing!

Admins/Mods will still have the verb viewable.
 2013-11-19 05:36:40 -06:00