cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-24 21:56:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
44,022 Commits 7 Branches 1 Tag
dependabot/github_actions/stefanzweifel/git-auto-commit-action-7.2.0
Commit Graph
1418 Commits
Author SHA1 Message Date
RavingManiac f1ccb3ee6e Muzzle-flash lighting effect for guns 
Energy guns now display shots remaining on examine
 2015-05-03 12:19:11 +10:00
PsiOmega 990b7b81a8 Another potential qdel sanity check. 2015-04-30 14:37:52 +02:00
PsiOmega 40f0901e3d Fixes #9037. 
Just one of many potential qdel issues. More to come, yay.
 2015-04-30 09:35:57 +02:00
Kelenius 4500eac948 Merge and removal of a wild file 
Merge branch 'dev' into ofChemistryAndStuff

Conflicts:
	code/modules/reagents/Chemistry-Holder.dm
 2015-04-29 14:20:44 +03:00
PsiOmegaDelta 851d5423f3 Merge pull request #8971 from mwerezak/burst-fire 
Gun firemode system, burst firing
 2015-04-28 20:24:03 +02:00
Kelenius 317abc6b79 Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/datums/recipe.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/effects/effect_system.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/extinguisher.dm
	code/game/objects/items/weapons/mop.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/organs/organ_internal.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/exodus-1.dmm
 2015-04-28 10:49:26 +03:00
mwerezak 9d9de73f03 Firemode bugfixes 2015-04-28 02:09:39 -04:00
mwerezak 472b284f24 Adds hitscan to the heavy sniper projectile 2015-04-28 02:08:12 -04:00
mwerezak e93e9c1434 Expands firemodes to include energy gun settings 
Expands on firemodes to include settings for the egun/adv egun,
floraray, and pulse rifle.

By default attack_self() now cycles firemodes for any gun. Updates
several projectile guns in a desperate attempt to avoid the need for an
unload ammo verb.
 2015-04-28 02:06:54 -04:00
Chinsky afa82e5d83 Merge pull request #9003 from mwerezak/dev-fixes 
Fixes
 2015-04-28 06:26:22 +03:00
mwerezak 529a0e3fe9 Fixes #8992 2015-04-27 00:37:16 -04:00
mwerezak 549270c73c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color 
Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-04-26 14:53:01 -04:00
Chinsky 5f30d0fa9a Merge pull request #8982 from PsiOmegaDelta/Bullets 
Adds practice rounds.
 2015-04-26 20:06:37 +03:00
mwerezak f1c2cbe519 Adds gun firemodes and burst firing 
Adds support for different gun firemodes, and defines firemodes for various automatic weapons, as well as the double-barreled shotgun
 2015-04-26 03:13:52 -04:00
Zuhayr 79e3acc95e Finalized wall refactor. 2015-04-26 12:58:57 +09:30
Zuhayr dbf8e53020 Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores. 2015-04-26 12:53:26 +09:30
PsiOmega 4a35631af1 Attempts to save Yosh's code. 2015-04-25 16:39:09 +02:00
PsiOmega e7d85f8edc Adds Destroys. 2015-04-24 17:11:14 +02:00
PsiOmega 1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
mwerezak 3acfe5960e Renames inventory slot string key defines 2015-04-23 04:57:03 -04:00
mwerezak 1bbb19297e Implements item_state overrides for back slot, hands 
Updates backpacks to use the item_state overrides where necessary, fixes #8577
 2015-04-23 03:26:18 -04:00
GinjaNinja32 d4eb42b38b Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/projectiles/targeting.dm
 2015-04-13 12:49:07 +01:00
PsiOmegaDelta f988545ed5 Merge pull request #8827 from comma/dev-freeze 
Some fixes
 2015-04-13 08:17:53 +02:00
Chinsky d6d005db6a Fixes #8550 2015-04-13 06:41:58 +03:00
PsiOmega 990530d118 Ports /vg/'s spell system for the sake of cult porting. 
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
 2015-04-09 20:08:06 +02:00
PsiOmega 71a8ddf50e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/paperwork/paper.dm
	code/modules/projectiles/projectile.dm
 2015-04-08 10:55:26 +02:00
Loganbacca 2063ebb8d8 Reflex runtime fix 
- Fixed runtime when reflex shooting targets
- Fixed runtime when stopping aiming at a target which has lost its connected client
 2015-04-05 23:42:01 +12:00
GinjaNinja32 fb235bf82c Nicer formatting of weapon firing text. 2015-04-05 08:29:59 +01:00
Chinsky ae75e3555e Merge remote-tracking branch 'remotes/upstream/dev-freeze' into conscience 
Conflicts:
	code/modules/mob/living/carbon/human/human_attackhand.dm
 2015-04-05 05:23:14 +03:00
Kelenius db30c15e4c Updates to science 
Protolathe and CI build procs moved to them from RD console.
Protolathe and CI now have a build queue. Designs take varying time to
build.
P and CI material storage is now a list instead of a set of vars.
origin_tech is now a list.
All sheets now contain exactly 2000 units of matter.
In design datum, chemicals and materials are two separate lists.
Designs are now sorted. The method is kinda hacky but flexible. They
have a var, sort_string. Designs are sorted alphabetically using it.
Circuits how show whether they build a machine or a computer in CI menu.
Adds item construction, for now protolathe is used.
 2015-04-04 13:38:03 +03:00
Mustafa Kalash 3c767c50fa Refactors 2015-04-03 21:33:33 -04:00
Mustafa Kalash 94a56e3c2b Adds a toggle for allowing a target to use a radio (handheld or headset.) 2015-04-03 17:42:16 -04:00
PsiOmega 8e55ad8114 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/mob.dm
 2015-04-03 09:33:05 +02:00
mwerezak a560acd3da Makes reflex shooting more obvious 
Reflex shooting now has a different colour than regular shooting, to prevent mixups
 2015-04-02 21:54:35 -04:00
Zuhayr c3eb6102b4 Added a few null checks. 2015-04-01 17:15:59 -07:00
Zuhayr 84302ca204 Chinsky fix ur shit 2015-04-01 08:21:44 -07:00
PsiOmegaDelta 015fb291fa Merge pull request #8698 from mwerezak/gun-icons 
Fixes swapped STS-35 item states
 2015-04-01 06:32:29 +02:00
mwerezak 5fe486dfe3 Fixes swapped STS-35 item states 
Renames the states to prevent future confusion
 2015-03-31 20:26:31 -04:00
Kelenius 41ff9819bd Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/organs/organ_internal.dm
	code/modules/organs/organ_objects.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/syringes.dm
 2015-03-31 17:44:42 +03:00
mwerezak 398459c2e7 Merge remote-tracking branch 'upstream/dev' into inventoryfix 
Conflicts:
	code/modules/organs/organ_external.dm
 2015-03-31 02:13:22 -04:00
Chinsky 65f61122b5 Merge pull request #8604 from Zuhayr/limbs 
Limb objects, severing and cybernetics
 2015-03-31 08:38:54 +03:00
mwerezak 9b2f5cea33 Merge remote-tracking branch 'upstream/dev' into inventoryfix 
Conflicts:
	code/game/gamemodes/revolution/rp-revolution.dm
	code/game/machinery/kitchen/juicer.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/structures/stool_bed_chair_nest/stools.dm
	code/modules/destilery/main.dm
	code/modules/hydroponics/biogenerator.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/carbon/monkey/inventory.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm
 2015-03-31 01:37:55 -04:00
Zuhayr 299a977701 Merge pull request #8679 from Yoshax/tempgun 
Fixes #8672
 2015-03-31 15:17:47 +10:30
mwerezak 9ad533a094 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/monkey/update_icons.dm
	code/modules/mob/mob_helpers.dm
	code/modules/spells/spellbook.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2015-03-31 00:16:56 -04:00
Zuhayr 3472513cf9 Merge pull request #8645 from mwerezak/gun-icons 
Adds Skowron's inhand icons for various guns
 2015-03-31 14:12:03 +10:30
= 601e6fb7ef Merged with dev. 2015-03-31 11:17:13 +10:30
Yosh 286dffcda0 Fixes #8672 
Fixes #8672 however the temperature gun is still utterly and completely
useless, but hey, at least you can fire it now.
 2015-03-30 21:59:59 +01:00
Chinsky c1b3e935d6 Backwards check fixed 2015-03-30 23:28:30 +03:00
Chinsky 246fc62b1c Whoops missed a bracket 2015-03-30 22:23:29 +03:00
Chinsky 1a93042226 Fixes #8548 
Removed referenced to type of ammo used from descriptions.
 2015-03-30 22:06:29 +03:00