cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,360 Commits 73 Branches 18 Tags
be9dcef9f06a0ef63dbccc75b43fd33a2ebe6b9b
Commit Graph

103 Commits

Author SHA1 Message Date
Rob Nelson
4894b01816 Import update_icons fixes from bay. 2013-12-06 23:50:24 -08:00
Rob Nelson
96b4073d62 Merch store is in and working. 2013-10-03 19:05:03 -07:00
Rob Nelson
4e696f18c1 Make icon paths absolute. 2013-09-24 20:06:18 -07:00
Rob Nelson
2b334d2b8f Get rid of a shitload of fluff, rework fluff system to work over MySQL, toss in an example of how it should work. 2013-08-31 11:23:21 -07:00
MagmaRam
d7876da147 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	icons/obj/custom_items.dmi
 2013-05-19 06:21:32 +07:00
MagmaRam
fbfa125f4b Bugfix: Fixed issues with custom item camera sprites 
icond/obj/custom_items.dmi: renamed off sprite for blue camera

code/modules/paperwork/photography.dm: made cameras use variables item_on and item_off for sprites so that other types of cameras (i.e. custom ones) can use their own sprites without getting messed.

/code/modules/customitems/item_defines.dm: set sprites for custom cameras "orange camera" and "old camera" to use item_on and item_off sprites in custom_items.dmi so that they had the correct sprites
 2013-05-18 22:00:15 +07:00
faux
6e85a3ed42 Master Bug Fixes 
- Fixes wall under maintenance tunnel door.
- Fixes AAAAHHHHHHHRRG psych office pressure issue.
- Fixes some names and DMIs on some items. (in theory)
 2013-05-18 05:57:21 -07:00
fauxtada
e932ac76b1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/modules/clothing/under/miscellaneous.dm
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
	icons/obj/custom_items.dmi
	maps/tgstation.2.1.0.0.1.dmm
 2013-05-18 04:56:40 -07:00
fauxtada
2b9130b00f Quick Fixes 
- Changed access to security washroom so detective can go in.
- Removed wall that was under maintence tunnel door.
- Fixed writerer's custom item. AGAIN. .. Because they can't decide what character they want it on.
- Added saloon dress to bar closet.
 2013-05-15 11:26:26 -07:00
fauxtada
fed2bfcedc fixed michael guess' zippo, added therapy doll dmis to code, the items aren't coded because i cannot get it to work for the life of me. 2013-05-02 02:00:04 -07:00
fauxtada
e384c90093 minor changes 
- Fixed accesses to security office doors.
- Added a second HoP closet for attire purposes. Armor and guns in one closet - fancy clothes in the second one.
- Fixed Writerer's custom item thing. Was attached to wrong character.
 2013-04-30 02:37:43 -07:00
fauxtada
c25bbff8f0 fixed writerer's custom item 2013-04-30 01:18:17 -07:00
fauxtada
48a6326747 custom items update 
- Michael Guess' golden lighter
- Krinn's saucepan hat
- Writerer's cat thing
 2013-04-25 00:57:55 -07:00
fauxtada
c1991ba0dd Player Requests Edition 
- Two canes will spawn in medbay storage for people with leg injuries.
- Added some more welding goggles for engineers in engineering.
- Armory has a second security hardsuit.
- CMO has hallway access to the medbay hardsuits.
- HoS hat spawns in HoS closet.
- White wedding dress spawns in chaplain closet.
- Removed Pulse Rifle and Laser Canon from ERT room.
- Detective's office will now start off with a cigeratte pack and a detective's flask.
- Three normal boring flasks now spawn behind the bar for the bartender to give out.
- Old Man Suit spawns in laundry room. - Requested by Book.
- Roaper's Callum suit ( http://baystation12.net/forums/viewtopic.php?f=33&t=7047 ) now spawns in under Knockoff Suit. It may or may not spawn in for him too, I don't know how this shit works but I think I got it right.
- Removed Roaper's items for Ian Colm. At least the code part, I don't know if I'm supposed to delete the DMIs or not so I left them in.
 2013-04-24 03:04:35 -07:00
Mordeth221
3bff68a9a2 Fixed icon_state of sven-kit to sven_kit 2013-04-23 23:11:12 +02:00
Mordeth221
76b2941803 Added custom APLU 2013-04-23 18:56:44 +01:00
Ravensdale
6316d28208 comments out suethecake's gun due to having a weapon's ban 2013-04-18 09:56:50 -07:00
Yeti
b3c9484398 Added Superboredguy's item: Engineering Hat 2013-04-13 14:32:11 -04:00
Yeti
4928a3aa59 Custom item: Old Camera 2013-04-12 22:40:24 -04:00
MrYeti
7ba4df4462 Added Purple Gloves 2013-01-15 17:44:23 -05:00
Cael_Aislinn
1c9b04ec74 copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-14 21:07:16 +10:00
Cael_Aislinn
990090326d compile fixes and cleanup 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-07 02:36:52 +10:00
Chinsky
24a02f90b9 Ported coats pockets 2013-01-04 05:31:14 +04:00
Cael_Aislinn
c0102cf13e Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/defines/procs/global_lists.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/mecha/working/ripley.dm
	code/modules/mob/living/carbon/human/human_attackalien.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/new_player/preferences.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-29 13:06:03 +10:00
Cael_Aislinn
e6c70937e5 Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/__HELPERS/game.dm
	code/__HELPERS/type2type.dm
	code/datums/helper_datums/getrev.dm
	code/game/atoms.dm
	code/game/gamemodes/events.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/telecomms/telemonitor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/objs.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mint.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/mob.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/photocopier.dm
	code/modules/power/gravitygenerator.dm
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/human_face.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-28 01:07:36 +10:00
Zuhayr
d59b160f80 Oen'g's baton. 2012-12-19 00:13:19 -08:00
Zuhayr
45527ec599 Four custom items plus config.txt. 2012-12-16 00:40:04 -08:00
Jim "Apples"
cff920917b Merge pull request #2054 from caelaislinn/work_in_progress 
Various
 2012-12-15 04:08:07 -08:00
Zuhayr
aedf5f2068 Ty Foster's custom necklace, Butcher Royce's custom Ripley skin and some minor changes to support it. 2012-12-15 02:08:03 -08:00
Cael_Aislinn
b7804cc295 Merge remote-tracking branch 'remotes/Baystation12/Baystation12/bleeding-edge-freeze' into work_in_progress 2012-12-15 00:39:16 +10:00
Zuhayr
6c3aec4198 Nasir's custom medallion. 2012-12-14 00:14:24 -08:00
Zuhayr
f8af31bdda Three custom items: Ana Ka'Rimah, Jane Doe, Altair An-Nasaqan. 2012-12-13 02:40:45 -08:00
Chinsky
ab440fbf7d Fixed compile error in custom items. 
Made rigs protect against radiation again.
 2012-12-01 18:35:27 +04:00
Cael_Aislinn
9391d55e6e compile fix 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-01 18:05:05 +10:00
MrYeti
1c3d72e471 Added My own Custom item and Misterbook's pipe spawning in his backpack. 
Also deleted some stuff that were requested for deletion.
 2012-11-28 16:38:40 -05:00
MrYeti
69992184d3 Deleted the items! 2012-11-27 14:16:21 -05:00
MrYeti
f1b328f1fb Finished up Roaper's Custom item 
Now ready to push!
 2012-11-26 18:55:54 -05:00
MrYeti
ded839e0f7 Added Custom Item: Monogrammed Handkerchief 2012-11-26 17:15:03 -05:00
MrYeti
fda5be14de Added Roaper's Custom Item 
Deleted some unwanted custom item stuff as well
 2012-11-26 16:40:19 -05:00
MrYeti
8d0ab6b56c Added Custom Item: Etched Beaker 2012-11-24 23:28:52 -05:00
MrYeti
10b42cc1b3 Fixed my mistake, 
Thanks to Sheep for catching it!
 2012-11-24 23:01:14 -05:00
MrYeti
de83a09f50 Added Custom Item Left Hand Glove 2012-11-24 15:33:46 -05:00
MrYeti
d63b1b232e Added Custom Item: Scanning Goggles 2012-11-24 14:22:14 -05:00
MrYeti
c92f831811 Added Engraved Zippo Lighter 2012-11-24 08:34:21 -05:00
MrYeti
314911e458 Added Custom item: Lithium Flask 2012-11-23 12:57:58 -05:00
MrYeti
77a2672a6e Added Custom Item: Fountain Pen 2012-11-22 15:48:15 -05:00
MrYeti
2b56956d67 Added Smash Recipe Custom Item 2012-11-13 19:56:52 -05:00
MrYeti
78d7f9ee42 Added Graduation Lighter. Deleted my own custom item. 2012-11-11 18:00:12 -05:00
RawrTaicho
f97f887458 Annnnnnnd another custom item: http://baystation12.net/forums/viewtopic.php?f=33&t=5413 2012-11-11 00:13:43 +00:00
RawrTaicho
864dbe8a84 http://baystation12.net/forums/viewtopic.php?f=33&t=5837 2012-11-10 23:43:24 +00:00