cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,471 Commits 8 Branches 0 Tags
f76a1d2024c00b7307b5458cae7f1e407f1be0b4
Commit Graph

217 Commits

Author SHA1 Message Date
Mloc-Argent
712e209ab6 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
 2014-09-10 22:14:37 +01:00
Whitellama
f5c9586153 Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer. 2014-08-31 02:12:04 -07:00
MrSnapwalk
8551a81c2b Adds the Cybernetic Casings custom item. 2014-08-30 18:53:04 -05:00
Zuhayr
f09d1218fe Master to dev merge. 2014-08-11 17:23:40 +09:30
Jarcolr
2db24a17d5 Typo 2014-08-10 11:57:40 +03:00
Jarcolr
4666966dab Fixes 2 broken custom items, adds 1 new one 
Fixes hazard hardsuit icon_state, paper icon_state missing for an item,
removed krinn_hatt from obj/clothing/hats.dmi since it's defined to be
in custom_items.dmi and added MiT labcoat
 2014-08-10 11:49:14 +03:00
PsiOmega
a093bee190 Fixes #5839 by making the comb slightly more gender aware. 2014-07-31 11:43:22 +02:00
Jarcolr
1e90a5b218 Adds Raptor1628's hazard hardsuit 
http://baystation12.net/forums/viewtopic.php?f=33&t=10888
 2014-07-31 10:44:34 +03:00
Jarcolr
e1267b7fdf Adds Supercotton's welding mask 
http://baystation12.net/forums/viewtopic.php?f=33&t=10768
 2014-07-30 21:20:33 +03:00
Jarcolr
bd4d07c18a Adds 2 approved custom items to code 
http://baystation12.net/forums/viewtopic.php?f=33&t=10949
http://baystation12.net/forums/viewtopic.php?f=33&t=10894
 2014-07-29 22:08:32 +03:00
Jarcolr
5b77883f36 Adds 2 approved custom items and update 
http://baystation12.net/forums/viewtopic.php?f=33&t=10952 for update
http://baystation12.net/forums/viewtopic.php?f=33&t=10850 for
Cataguette's item
http://baystation12.net/forums/viewtopic.php?f=33&t=10527 for Yankee's
item
 2014-07-29 21:04:41 +03:00
Whitellama
bbc9150793 Updated body_parts_covered 2014-07-26 17:06:08 -07:00
Zuhayr
3976433396 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-17 20:57:06 +09:30
Decius
3a92fe188c Changes labcoat sprite to be closed on custom item... 
Signed-off-by: Decius <deciusreln97@gmail.com>
 2014-07-14 21:11:46 -04:00
Zuhayr
7c6bec03ae Added Roaper's custom item, generalized the hardsuit modification kit somewhat, modified Solaruin's custom item accordingly. 2014-07-09 16:58:38 +09:30
Hubblenaut
d8f1b255a2 Fixes Sasha Mason-Kalinka's custom item 2014-07-02 10:16:15 +02:00
Jarcolr
be74be4c95 Fixes the jackboots 2014-06-28 14:11:58 +03:00
Jarcolr
5de1f11e8d Updates a item sprite and adds 2 approved items 
http://baystation12.net/forums/viewtopic.php?f=33&t=10693
http://baystation12.net/forums/viewtopic.php?f=33&t=10678
Paths to new files are:
/obj/item/weapon/lighter/zippo/fluff/isaac_jachym
/obj/item/clothing/shoes/jackboots/fluff/kecer_eldraran
 2014-06-28 11:33:49 +03:00
Mloc-Argent
dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm
 2014-06-20 22:02:40 +01:00
Boop
3dfc20eebe Fix a runtime for Mloc 
(mloc is so lazy)
Also makes custom item spawning a tiny bit nicer!
file will only be loaded once, instead of every time someone spawns
 2014-06-17 16:29:37 +01:00
Zuhayr
9e7fe6d700 Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this. 2014-06-11 01:14:38 +09:30
Jarcolr
3619dede1a Generalized kit 
Hopefully this is going to be the last commit.
 2014-06-08 20:00:31 +03:00
Jarcolr
6adc65dfcf Fixes 2014-06-08 19:02:42 +03:00
Jarcolr
865cbb7e25 Adds matthew951's hook mod kit 
/obj/item/device/kit/fluff/hook
http://baystation12.net/forums/viewtopic.php?f=33&t=10218
 2014-06-08 11:37:28 +03:00
Jarcolr
32a015d83c Makes the kit very very simple 
As simple as it can get, I think.
 2014-06-08 11:12:29 +03:00
Jarcolr
553d1f5f00 Adds Raptor1628's custom item 
http://baystation12.net/forums/viewtopic.php?f=33&t=10609
/obj/item/clothing/under/rank/security/fluff/ronan_harper
 2014-06-08 02:08:27 +03:00
Jarcolr
d5da0641eb Makes the kit compatible with recent changes 
Might be too fancy, but it's going to be useful for other kits.
 2014-06-08 01:57:54 +03:00
Jarcolr
0a00370799 Added solaruin's salvage crew hardsuit 
http://baystation12.net/forums/viewtopic.php?f=33&t=10564
/obj/item/device/modkit/salvage
 2014-06-08 00:38:29 +03:00
Jarcolr
5966d90f33 Adds mewth's blood red pendant 
/obj/item/clothing/tie/fluff/radi
http://baystation12.net/forums/viewtopic.php?f=33&t=10333
 2014-06-07 11:26:59 +03:00
Jarcolr
2d51c24364 Adds 2 approved custom items to code 
http://baystation12.net/forums/viewtopic.php?f=33&t=10561
http://baystation12.net/forums/viewtopic.php?f=33&t=10517
/obj/item/weapon/lighter/zippo/fluff/janis_godmanis
/obj/item/clothing/ears/fluff/qokkri
 2014-06-07 10:46:11 +03:00
mwerezak
d5217fef9d Custom item for YankeeSamurai: Hal Ishimaru 2014-05-30 19:52:54 -04:00
Jarcolr
f318e24827 Adds 2 custom items and updates a sprite 
Paths are:
/obj/item/clothing/glasses/eyepatch/fluff/edmund
/obj/item/clothing/suit/storage/fluff/lombardi
 2014-05-27 20:47:01 +03:00
Jarcolr
4615b35a7a Adds secret's approved custom item 
http://baystation12.net/forums/viewtopic.php?f=33&t=10398
 2014-05-18 00:02:11 +03:00
Jarcolr
f55050bd41 Adds Serveris's custom item 
http://baystation12.net/forums/viewtopic.php?f=33&t=9992
 2014-05-17 20:36:13 +03:00
Jarcolr
5b15498fa8 Adds 50_n00b's approved custom item. 
Alright, this one shouldn't have any issues.
 2014-05-17 19:55:30 +03:00
Jarcolr
7e34210f6f Fixed paths 
Woops.
 2014-05-17 16:57:49 +03:00
Jarcolr
a6595f833a Adds Meyar's , Serithi's and Ikky's items 
Adds 3 approved custom items.
http://baystation12.net/forums/viewtopic.php?f=33&t=9776
http://baystation12.net/forums/viewtopic.php?f=33&t=10197
http://baystation12.net/forums/viewtopic.php?f=33&t=10265
 2014-05-17 14:40:31 +03:00
suethecake
3f9eff36fc Initial commit for Kaine's custom items. 2014-04-25 19:13:51 -06:00
Mike
d76fb3b5c2 Custom item for Von2531: Jack Washington 2014-04-24 00:56:44 -07:00
Jarcolr
51f8c4a530 Removes rogue , \ 's 
Why are you still here?
 2014-04-21 20:09:51 +03:00
Jarcolr
7734e69dda Quick fix 
Whoops.
 2014-04-21 19:50:19 +03:00
Jarcolr
80b4e0fa5b Adds "Harold's Cane" and "Farwa plush doll" 
Adds the defines and custom sprites for 2 approved custom items.

http://baystation12.net/forums/viewtopic.php?f=33&t=9960
http://baystation12.net/forums/viewtopic.php?f=33&t=9780
 2014-04-21 19:32:05 +03:00
Graham Lloyd
72e45ebf7b A first pass at more realistic w_class values 2014-04-03 17:54:06 -04:00
Zuhayr
f51c44cee9 Typo and compile fix. 2014-01-09 23:56:14 +10:30
DJSnapshot
8ef5d78b04 stealthfix 2014-01-06 17:21:26 -08:00
DJSnapshot
dcef3e81e8 Papadrow's custom dress for lillian: http://baystation12.net/forums/viewtopic.php?f=33&t=9363 2014-01-06 13:15:15 -08:00
DJSnapshot
7ad5b43707 Commiting Michael Guess's pendant: http://baystation12.net/forums/viewtopic.php?f=33&t=9367 2014-01-06 13:06:16 -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