cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-28 02:52:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,885 Commits 2 Branches 1 Tag
b7d5c872a31f38fad00a5f5be912f1663cb5079f
Commit Graph

2468 Commits

Author SHA1 Message Date
Chinsky
18a5554da5 Merge branch 'secfashion' 2013-01-12 22:50:22 +04:00
Chinsky
08160b5111 Added alternative security uniforms to wardrobes. 
Security armor vest now has different sprite.
 2013-01-12 22:48:18 +04:00
Chinsky
8a3758af72 Morgue trays now can open in different direction depending on how they are placed. 
No way to rotate ingame though, mapping and badminning only.
 2013-01-12 09:32:08 +04:00
Chinsky
2c91523b84 Security belt now can hold taser, stunbaton and tape roll. 2013-01-11 04:43:15 +04:00
Chinsky
2e75059c3a Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-01-09 12:45:04 +04:00
Chinsky
7fea186d64 EMP now will have !!FUN!! effects on implants. 
Affected implants:
-Explosive
-Death alarm
-Tracking
-Chemical

Also added new sound for implant activation.
Fixed derp in implant surgery.
 2013-01-09 12:43:22 +04:00
Cael_Aislinn
2ad36df02a fixed up a bunch of miscellaneous derps that broke compiling (several unticked files, as well as one mistakenly removed file) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-08 23:03:48 +10:00
Cael_Aislinn
7efc1aafef Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	icons/turf/areas.dmi
	maps/RandomZLevels/stationCollision.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-07 22:26:24 +10:00
Hawk-v3
19b63ade1b Merge pull request #2151 from comma/master 
Implants
 2013-01-06 21:09:56 -08:00
Zuhayr
f7f014df6f Added binary talk for positronic brains, fixed mech destruction error, added positronic brain design to protolathe. 2013-01-07 14:47:29 -08: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
Cael_Aislinn
aae42d928a Merge branch 'incremental_tg' r5200 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/__HELPERS/type2type.dm
	code/__HELPERS/unsorted.dm
	code/datums/datumvars.dm
	code/datums/disease.dm
	code/datums/organs/organ_external.dm
	code/datums/supplypacks.dm
	code/defines/obj.dm
	code/game/area/areas.dm
	code/game/atoms.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/hud.dm
	code/game/jobs/access.dm
	code/game/jobs/job/civilian.dm
	code/game/machinery/alarm.dm
	code/game/machinery/cloning.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/medical.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/objects/effects/decals/contraband.dm
	code/game/objects/effects/signs.dm
	code/game/objects/items/devices/PDA/PDA.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/game/objects/items/weapons/photography.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/window.dm
	code/game/sound.dm
	code/game/verbs/ooc.dm
	code/global.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/DetectiveWork/footprints_and_rag.dm
	code/modules/DetectiveWork/scanner.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminhelp.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/awaymissions/gateway.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mint.dm
	code/modules/mining/ores_coins.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/alien/alien.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/say.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/mob/new_player/login.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/mob/new_player/savefile.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photocopier.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/setup.dm
	code/unused/mining/datum_processing_recipe.dm
	code/unused/powerarmor/powerarmor.dm
	code/world.dm
	html/changelog.html
	icons/effects/96x96.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/hydroponics.dmi
	icons/obj/items.dmi
	icons/turf/areas.dmi
	icons/turf/walls.dmi
	maps/RandomZLevels/fileList.txt
	maps/RandomZLevels/spacebattle.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-07 00:23:22 +10:00
Chinsky
7abec8d3bc Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-01-06 12:15:30 +04:00
Chinsky
87d6ad1b7a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-01-06 12:13:28 +04:00
Chinsky
5f0c39f1cf Added implant removal surgery. 
If you fail the step, has small chance of activating implant.
Gives you a sound and ~15 ticks to run away like hell.

Changes I did to other parts to make this possible:
-Implants are now organ-based, not mob-based
-Part of implant working code is moved to appropriate activate() procs
 2013-01-06 11:25:53 +04:00
Hawk-v3
ac229bb38e Merge pull request #2148 from Zuhayr/master 
Posibrain fix, seedbag fix.
 2013-01-05 17:18:26 -08:00
Zuhayr
981e7ff3d7 Description fix for posibrains, reset timer on posibrain search, minor fix for Gau's seedbag. 2013-01-06 12:20:51 -08:00
Hawk-v3
62bd0e8a68 Merge pull request #2146 from comma/master 
Violence and carnage
 2013-01-05 15:58:45 -08:00
Hawk-v3
d1fbc74a11 Merge pull request #2145 from GauHelldragon/bleeding 
Seedbags!
 2013-01-05 15:56:34 -08:00
Zuhayr
4f93d392f4 Added sprites and basic code for positronic brains. 2013-01-06 04:04:25 -08:00
Zuhayr
6751c1a6be Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-01-06 03:12:48 -08:00
Chinsky
859ae76d8d Added a chance for stool breaking over someone, stunning them and dealing more damage. 2013-01-04 16:24:35 +04:00
Chinsky
bc17911eac Added ability to slam people against the tables 2013-01-04 09:06:33 +04:00
Chinsky
1bb6a7bdb1 Added ability to bash people against the windows 2013-01-04 08:36:41 +04:00
Chinsky
76efcdb254 Added ability to pick up stools. 2013-01-04 07:42:44 +04:00
Chinsky
24a02f90b9 Ported coats pockets 2013-01-04 05:31:14 +04:00
GauHelldragon
17317e3ff6 Fixes closets and destructive analyzer 
You can no longer load your robot modules into these. Fixes #2138
 2013-01-03 16:08:46 -08:00
Cael_Aislinn
e43e96d296 removed exploit where syndicate ids could make players untargettable 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-03 14:38:59 +10:00
Chinsky
88baf11731 Added missing contraband.dm file 2013-01-03 08:20:08 +04:00
Chinsky
5e24bc8f34 Added surgery caps. 2013-01-03 02:46:15 +04:00
GauHelldragon
3d12d0b234 Seedbags now put their ouputing seeds into your hand 
Added "Unload All" button to interface
 2013-01-02 11:27:51 -08:00
Chinsky
7b1732dda0 Moved global steps list and it's initializing to TG's new place for such things. 
Moved helper for checking if mob is down on some operable surface to unsorted helpers.
Checking for tool type now will properly work with subtypes (istype instead of comparing type var)/
 2013-01-02 18:38:31 +04:00
GauHelldragon
b1dd8f50f3 Seedbags! 
Added seedbags to hydroponic lockers and the nutri-vendor
They function similarly to plantbags, but obviously hold seeds. The interface for taking seeds out is identical to the smartfridge, however.
 2013-01-02 02:54:48 -08: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
31349fb7d3 Merge branch 'incremental_tg' r5067 into bs12_with_tgport 
removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates)

Conflicts:
	baystation12.dme
	code/__HELPERS/type2type.dm
	code/controllers/configuration.dm
	code/datums/datumvars.dm
	code/datums/helper_datums/getrev.dm
	code/defines/obj.dm
	code/game/gamemodes/events/black_hole.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/turrets.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/turfs/turf.dm
	code/game/verbs/ooc.dm
	code/global.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_memo.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/holder2.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/assembly/igniter.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photocopier.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/setup.dm
	code/stylesheet.dm
	code/world.dm
	config/admins.txt
	config/config.txt
	html/changelog.html
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
	icons/turf/areas.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-28 14:13:11 +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
cib
39b12b280a Fixed a few problems with PDA crew manifest. 2012-12-24 21:13:29 +01:00
cib
6da98a0c00 Everyone now has crew manifest, and it uses the good version on PDA's. 2012-12-24 20:50:20 +01:00
cib
026bbfa3b7 Implemented ghetto surgery tools. 2012-12-24 18:25:02 +01:00
Hawk-v3
aa9207ba44 Merge pull request #2102 from Ravensdale/master 
Station-wide boom sound
 2012-12-23 06:00:41 -08:00
Ravensdale
6a359474cc Update code/game/objects/explosion.dm 
Removing a repeat if statement
 2012-12-22 14:58:01 -08:00
Ravensdale
9d9061180d Port of z-level explosion sound effect from pre-merge. Tested and confirmed working with c-4, welding tanks, meteors and roro explosions, probably more! 2012-12-22 14:46:44 -08:00
Hawk-v3
70b40dfc6b Merge pull request #2096 from comma/crates 
Crates
 2012-12-22 08:29:21 -08:00
Chinsky
581f2c4db5 Merge branch 'master' into crates 2012-12-21 01:03:20 +04:00
cib
1d0147c396 Merge branch 'master' of github.com:Baystation12/Baystation12 into feature 2012-12-19 19:40:28 +01:00
Zuhayr
24473bdd19 A small fix to the throwing string when a mob is struck with a baton. 2012-12-19 01:57:47 -08:00
cib
679c715482 Merge branch 'master' of github.com:Baystation12/Baystation12 into minor_feature 2012-12-16 14:57:54 +01:00
cib
a6d5a6a26e Removed yet another type of gib that looks like a head. 
Just how many heads does a person have, according to this code?
 2012-12-16 04:40:19 +01:00
cib
0855c5d1af Fixes issue #2006 
Medical belt can now hold autoinjector.
 2012-12-16 04:04:43 +01:00
cib
9c4a48ffe5 Gibbing now creates actual limbs instead of decals. 
Especially useful for the head, but also pretty nice in that you can now pick the limbs up and mail them to security.
 2012-12-16 03:25:26 +01:00