cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 17:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,790 Commits 2 Branches 1 Tag
a4e5bad4098b901bab0594fccf921ebaf831e4fe
Commit Graph

126 Commits

Author SHA1 Message Date
Segrain
183c44c4c8 Smallfix. 2013-10-18 08:38:14 +03:00
Chinsky
b96f9ef650 Merge pull request #3744 from Baystation12/dev-freeze 
BYOND AKBAR
 2013-10-10 02:45:45 -07:00
Mloc-Argent
ebf2ba2d4a Fixes. 
Made glowshrooms and intercoms not use a ridiculous internal loop, and fixed a pickup luminosity bug with glowshrooms.
fixes #3708
Fixes #3718
Fixes #3702

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-07 20:35:26 +01:00
Zuhayr
c7942b7eaf Merge pull request #3651 from SkyMarshal/airfixes 
ZAS update, needs testing.
 2013-09-07 05:46:04 -07:00
SkyMarshal
073f462e1b WIP ZAS rework. 2013-09-03 20:25:02 -07:00
Erthilo
3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm
 2013-09-02 23:32:33 +01:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path. 
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-01 21:53:36 +01:00
Erthilo
547c1e670d Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work. 2013-08-31 20:12:19 +01:00
Mloc-Argent
adc3c14779 Revert #3316 from BEF due to compile errors and (assumed) missing files. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-20 18:38:00 +01:00
LordBraindead
08d2e22220 fire update 
enabled fire to destroy floors and objects
also tweaked the behaviour of glass to enable glasslocks against fire
also made fire extingiushers stop being useless
 2013-07-14 21:20:45 +02:00
comma
1095bd1978 Merge branch 'bleeding-edge-freeze' into viro 2013-07-09 12:49:23 +04:00
Spamcat
df90824d60 Whoa, 2 barsign.dm's? WTF? 2013-07-08 23:25:13 +04:00
LordBraindead
ba15e0f515 readjusted composition of syndie bombs 
set them to produce a 1-2-5 explosion for the fire changes
 2013-07-05 09:06:34 +02:00
comma
50f94ddd93 Merge branch 'bleeding-edge-freeze' into viro 2013-07-01 17:33:24 +04:00
comma
da884f4ddc Merge branch 'bleeding-edge-freeze' of https://github.com/comma/Baystation12 into viro 2013-07-01 17:23:09 +04:00
Whitellama
f3224bba2e Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-24 21:48:33 -07:00
Zuhayr
f5cc695c19 Merged airlock assembly changes and ZAS changes, hopefully. 2013-06-24 21:06:51 -07:00
SkyMarshal
702fea234a Forgot the files, doh! 2013-06-23 19:53:59 -07:00
meyar
7647dbd9ab Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-23 00:16:57 -04:00
Whitellama
83ab2c430b Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-22 00:19:43 -07:00
Zuhayr
476c8f2fcd Fix for destroying alien walls with your bare hands. 2013-06-21 19:03:12 -07:00
Jim Apples
a23e1c7a92 Added 5 barsigns. 
Signed-off-by: Jim Apples <cheeckan@gmail.com>
 2013-06-19 17:51:41 +01:00
Chinsky
960a22ee43 Changes way viruses are stored in mobs. 
Now it's an associative list:
uniqueID - virus datum

Updated most instances to match it.
 2013-06-19 02:28:53 +04:00
Whitellama
d23b758006 WIP: Implementing space ninja gamemode 2013-06-15 16:09:23 -07:00
Chinsky
7a8a822a92 Made it possible for mob to be infected with several viruses at once. 2013-06-09 13:31:16 +04:00
Zuhayr
9e71180e1b Merge conflict resolution, using BEF. 2013-06-05 14:22:04 +09:30
Spamcat
c5a57ccdc4 Runtime fixes, tweaks. 2013-06-04 16:25:41 +04:00
Aranclanos
799ed74a3c Made the effects of EMP pulses get garbage collected. Less lag on the singularity (around 20 effect del per 5~10 seconds) 2013-06-04 13:47:26 +04:00
rockdtben@gmail.com
8203e7dced Push sparks lag to GC this should greatly reduce lags. 
Test: 20 emitters shooting for 10 minutes. No lag. Along with other various tests.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5757 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-06-04 13:30:07 +04:00
VitrescentTortoise
5bcb4f4bcb Added hidden fingerprint to crayon drawings. 2013-06-01 16:19:48 -07:00
Chinsky
3bbb250749 Added bloody footprints. 2013-06-01 14:30:05 +04:00
Chinsky
0b9c904252 DRY BLOOD FOR THE BLOOD GOD. 
Blood will now dry up in around half an hour.

Also moved blood drip define out of disposals. WTF.
 2013-06-01 10:56:59 +04:00
SkyMarshal
b0d1d47c23 Fixes lighting, backpacks getting contaminated, and bombs not working. 2013-04-18 09:58:37 -07:00
SkyMarshal
710e97bcc6 fuel is now a bit less derpy. Napalm produces volatile fuel, and less of it. Fire consumes more welding fuel. 2013-04-18 09:56:52 -07:00
SkyMarshal
698e7af57c Fixes lighting, backpacks getting contaminated, and bombs not working. 2013-04-17 22:07:41 -07:00
SkyMarshal
221901ba3a fuel is now a bit less derpy. Napalm produces volatile fuel, and less of it. Fire consumes more welding fuel. 2013-04-11 12:14:47 -07:00
Spamcat
40067b3d95 Fixed #2598 
also fixed a derp in CE's office
 2013-03-31 16:54:53 +04:00
Cael_Aislinn
93ef7b83d8 replaced infestation slimes with spiderlings (with 0% chance to grow into giant spiders), reduced spiderling noisiness, made them less jittery (easier to squish) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-20 20:56:09 +10:00
Cael_Aislinn
5b0f31e89f tweaked, reworked and restructured a bunch of events, fixed the capitalisations issue in my repo structure 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-10 21:22:02 +10:00
Chinsky
d1972efbb8 Can order contraband crates. 
Moved most of 'contraband' out of crate to others.
 2013-01-28 18:07:34 +04:00
Cael_Aislinn
bb5a349fcf Merge branch 'incremental_tg' r5600 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/controllers/master_controller.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/machinery/computer/cloning.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/implants/implantnanoaug.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/shoes/miscellaneous.dm
	code/modules/clothing/under/ties.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/say.dm
	code/modules/mob/mob_defines.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/modules/projectiles/projectile.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/setup.dm
	config/config.txt
	html/changelog.html
	icons/effects/effects.dmi
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	maps/tgstation.2.1.0.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 00:23:37 +10:00
Kortgstation@gmail.com
b0077b3498 Removed nanoaugs, they were unbalanced and never used outside of badmins shitting things up. 
They also added extra checks to

-Everytime a mob attacked (checking for super strength and electric hands)
-Every time a mob was attacked (checking for dermal armour)
-Every time a human was shot (checking for reflex)
-Every time a human breathed (checking for rebreather)
-Every tick of human life (checking for regen)
-Every hud update (checking for radar)

Not to mention just cluttered mob code in general. I know there won't be any noticeable performance increase from this but seeing as they were never going to be finished (I asked Doohl beforehand) and mob code is messy enough as is, I think only good can come of removing the code.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5587 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-20 10:45:20 +00:00
giacomand@gmail.com
f6078aba78 - Bugfix for user created areas not correctly powering machinery. 
- Fix for retaliating hostile mobs to not attack itself.
- Grammar fix for goats and cows.
- Fix for malfunction and continuous rounds; which doesn't stop the count down timer when the AI dies.
- Spiderlings won't grow inside vents and spiderlings are much easier to kill, can be shot with a projectile and display a message after dying.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5548 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-14 17:46:33 +00:00
Cael_Aislinn
cf6aadef09 remove some unused files, tick barsigns.dm and removed duplicate definition 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-14 21:23:47 +10: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
petethegoat@gmail.com
adae991ef5 Alien runtimes fixes from Cael. 
Added a new syndicate bundle option, the smooth operator. Includes a pistol, silencer, clean up gear, and the ever essential suit and new formal shoes, with sprites by Flashkirby.
Currently the shoes are only used by smooth operators, but I'm gonna ask Ikarrus to put some on the latest map when he's done with it.

Changed the 9mm casing to use midbullet2, as weakbullet is just pathetic.

Removed /obj/item/weapon/glass, on account of it being awful and unused.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5543 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-13 22:08:16 +00:00
baloh.matevz@gmail.com
227d561acc - Made biomass a viable thing to spawn. It spreads and grows exactly the same as space vines (kudzu), but unlike kudzu, which is opaque, but not dense, biomass is dense, but not opaque. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5533 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-12 22:27:21 +00:00
giacomand@gmail.com
a56e922053 Committing for Cael_Aislinn: 
= Giant Spiders =
- Nurses spin webs which impede progress, bundle items and mobs up in cocoons, lay eggs to create spiderlings
- Nurses are slow and weak, but their bite has a chance to paralyse the victim
- Spiderlings skitter about and eventually grow into giant spiders. 
- Spiderlings will ventcrawl, so they can spread over the station pretty fast. 
- Hunters are fast, have decent health and the most effective poison
- Guards are medium speed but the health and direct damage
- The poison of hunters and guards can cause hallucinations if they bite you

= Farm animals =
- Cows can be milked or butchered for a large supply of meat. Sadists can also tip them over (with intent_help). 
- Goats can also be milked, but have a nasty temperament. 
- Chicks grow up to be chickens, who lay eggs and continue the cycle. But where did it start? (they're very noisy). 
- All three are orderable via QM. 

My changes:

- Added a spider infestation event.
- Optimized code with spiders and simple_animals.
- Made a /hostile/retaliate type which will only fight back when hurt. Based on Cael's code.
- Added some farm animals on the map.
- Changed events, added a setup() proc which can let you setup variables or the event. Made the event only kill itself when it has called, announce(), start() and end().
- Brainrot will only need alkysine as a cure.
- Communication blackout will always be silent.
- Changed some admin buttons to use the new event system.
- Added a forceEvent proc which you can use when you enable debug verbs.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5525 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-12 16:44:06 +00:00
Cael_Aislinn
bdeb96b7e5 Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/__HELPERS/game.dm
	code/controllers/shuttle_controller.dm
	code/datums/datumvars.dm
	code/datums/supplypacks.dm
	code/defines/obj/storage.dm
	code/defines/obj/vending.dm
	code/defines/obj/weapon.dm
	code/defines/procs/command_alert.dm
	code/game/area/Space Station 13 areas.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/dust.dm
	code/game/gamemodes/events/miniblob.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/factions.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/jobs/access.dm
	code/game/jobs/job/assistant.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/engineering.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/alarm.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/ai_core.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/message.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/constructable_frame.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/recharger.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/teleporter.dm
	code/game/machinery/wishgranter.dm
	code/game/mecha/mech_fabricator.dm
	code/game/mecha/working/ripley.dm
	code/game/objects/items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/objects/items/devices/radio/encryptionkey.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/medical.dm
	code/game/objects/items/weapons/cards_ids.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/hydroponics.dm
	code/game/objects/items/weapons/manuals.dm
	code/game/objects/items/weapons/secstorage/secstorage.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/storage/firstaid.dm
	code/game/objects/items/weapons/storage/kit.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
	code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/electricchair.dm
	code/game/objects/structures/extinguisher.dm
	code/game/objects/structures/watercloset.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/game/vehicles/airtight/airtight.dm
	code/game/vehicles/vehicle.dm
	code/global.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/critters/critter_defenses.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/power/cable.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/revolver.dm
	code/modules/projectiles/projectile/change.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	code/modules/recycling/sortingmachinery.dm
	code/modules/research/designs.dm
	config/config.txt
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	icons/obj/grenade.dmi
	icons/obj/projectiles.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-11 22:12:31 +10:00
petethegoat@gmail.com
7500ac50f8 Committing two proposed commits by Malkevin: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11499 & http://forums.nanotrasen.com/viewtopic.php?f=16&t=11717 
Owl mask is now a gasmask.

Adds the missing icons for the arrest statuses of Parolled and Released, as well as a little blinking icon for chemical implants to hud.dmi
And adds them to hud.dm so they show in game also.

Updated the changelog.

Path change:
/obj/item/clothing/mask/owl_mask > /obj/item/clothing/mask/gas/owl_mask

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5501 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-09 12:53:42 +00:00