cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-20 15:12:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,282 Commits 2 Branches 1 Tag
39229e4a1fdfa75008d4649fa76222b51b0fe248
Commit Graph

189 Commits

Author SHA1 Message Date
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
RawrTaicho
fde3147c5c - http://baystation12.net/forums/viewtopic.php?f=33&t=5801 2012-11-10 22:57:09 +00:00
Chinsky
c55e290d4b updated configs on MLoc's request. 
Swapped loading mods and loading admins  in places during worldstart, so former mods will properly adminned.
Fixed paths for custom items.
 2012-11-07 20:35:02 +04:00
Chinsky
6d20c25cc1 Fixed custom welding helmets paths, making them act as welding helmets again. 2012-11-01 02:57:54 +04:00
Chinsky
6f1852449d Ported custom items system. 2012-10-30 02:27:51 +04:00
Erthilo
c5f126430a Merge pull request #1718 from ThatOneGuy42/master 
Fixes an indention issue
 2012-09-28 11:55:55 -07:00
Jim "Apples"
fb3f9f0522 Merge pull request #1720 from SparklySheep/patch-4 
Small custom item fix for my comb.
 2012-09-24 07:16:35 -07:00
Cael_Aislinn
1bf5b97b2e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	code/modules/customitems/item_spawning.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-09-22 18:31:52 +10:00
SparklySheep
11d384bede Small custom item fix for my comb. 2012-09-20 15:24:47 -05:00
Chase Clary
570dda0e07 Fixes a tiny indention error that Cael showed me in line 55. 2012-09-15 20:31:47 -05:00
Chase Clary
565451fa78 REALLY fixes Roaper's custom item (I forgot to code the spawning thing-y for his ID) and adds mah cane. 2012-09-12 21:14:50 -05:00
Chase Clary
605b4872e1 Should fix the custom item problem with Roaper's ID. I can't tell for sure though, because I have no way to test it. 2012-09-09 17:24:45 -05:00
Jim "Apples"
dd8964b0eb Merge pull request #1706 from Asanadas/master 
Adding 2 custom items
 2012-09-08 04:02:48 -07:00
Chase Clary
fa29365cf5 Should add Roaper's custom ID. 2012-09-07 19:18:07 -05:00
Asanadas
a13b922ed8 My attempts at adding custom items for executivekill http://baystation12.net/forums/viewtopic.php?f=33&t=5156 
and thejesster14
http://baystation12.net/forums/viewtopic.php?f=33&t=4936

Signed-off-by: Asanadas <asanadas@hotmail.com>
 2012-09-07 17:59:01 -04:00