a2f944cfd9
Merge pull request #2722 from ZomgPonies/russian
...
Revolver Stuff
2016-01-11 00:18:21 -05:00
576eb179e1
Armory Tweak
2016-01-09 23:29:35 -05:00
eb8b2cc09f
Adds Fun
2016-01-07 15:08:12 -05:00
7830cd215b
shotgun
2016-01-03 04:03:48 -05:00
eade350dc8
Sec Rifle Port
2016-01-02 01:06:37 -05:00
62f4f5cf66
Revolver stuff
2015-12-03 23:18:03 -05:00
58253b23ce
ammo tweak
2015-10-07 14:51:14 -04:00
efcbf98c8d
how did this not commit
2015-10-06 17:19:07 -04:00
623696b985
Ammo Update and Fixes
2015-10-06 17:18:39 -04:00
ea305d3ffa
Saber SMG update, add armour piercing variable
2015-09-21 22:50:07 +02:00
f41f0a59fe
Guns update
2015-09-14 04:05:20 +02:00
1c6c733a52
Nuke Ops and Traitor Update+Balance
2015-09-08 19:38:30 -04:00
a019934e9e
Pass I
2015-09-04 05:18:48 -04:00
6dfb4a732d
Finally done
2015-05-09 07:12:54 -04:00
a05e70585e
Fixes
2015-05-08 17:59:42 -04:00
cb0a65b96f
Let's try this
2015-05-08 17:32:34 -04:00
dec621eefd
Revert "R&D Research Levels Unification"
2015-04-07 01:16:19 -04:00
a0be969870
Unifying tech levels
...
Unifies tech levels between design and their products.
2015-04-06 22:07:44 -04:00
796dbf233a
[Goonchem] Tweaks, Fixes, etc.
2015-03-28 21:16:13 -04:00
d9a257c890
Teleporter Gun, Fixes, and Tweaks
2015-03-22 02:45:02 -04:00
96a941ba19
Fixes and Guns
2015-02-22 16:32:35 -05:00
1f5ef8d4dd
Merge pull request #380 from Markolie/master
...
Adds celsius to the freezer/heater, crafting update
2015-02-22 08:30:11 -05:00
1c1ebc3f3f
Merge pull request #383 from Fox-McCloud/Syndi-Hardsuits
...
Syndi hardsuits
2015-02-22 08:27:38 -05:00
efb45ea228
Table crafting refactor
2015-02-22 01:50:57 +01:00
edde2d10c6
Dart and Syringegun
2015-02-21 09:54:02 -05:00
99d92aea35
Buckshot
2015-02-20 04:46:53 -05:00
fece84d974
Fixes-Tweakes
2014-12-14 03:18:10 -05:00
8238638283
Gun Harmonization
2014-12-13 11:18:56 -05:00
43f3539b94
Merge pull request #11 from Fox-McCloud/Tech-Shells
...
Tech Shells
2014-11-30 06:44:57 -05:00
805c638adf
Tech Shells
2014-11-30 06:36:31 -05:00
9a391827b6
Shotgun and Sprite Updates
2014-11-30 00:09:47 -05:00
35fa4600e7
Merge branch 'master' of https://github.com/Markolie/Paradise
2014-11-29 02:39:45 +01:00
ae8f08e2b8
Fixes reflection, various security level fixes, gamma armory update, communication console fixes
2014-11-29 02:05:42 +01:00
a4c72d4603
Species and Guns
2014-11-28 19:13:41 -05:00
dd200af4bf
Nuke Ops Rework Phase 2
2014-11-05 06:56:46 -05:00
650c9a3e3c
Nuke Ops Rework Phase 1
2014-11-03 23:45:00 -05:00
521467fa3e
C4 now explodes on detonation, Stechtkin pistol fix
...
The Stechtkin pistol now works properly, C4 will now create a small
(Welder tank) sized explosion upon being detonated.
2014-05-04 02:28:06 -04:00
0a83349284
Adds incendiary shotgun shells available via hacked autolathes in a new subclass of incendiary bullets and gave chemical dart shells their own sprites.
...
Conflicts:
code/game/machinery/autolathe.dm
code/game/mecha/equipment/weapons/weapons.dm
code/modules/projectiles/ammunition/bullets.dm
code/modules/projectiles/projectile/bullets.dm
icons/obj/ammo.dmi
2014-03-02 01:27:07 -05:00
71c07e208a
Improved creature AI and random mob spawning in caves.
...
Also equipment lockers.
Conflicts:
code/game/objects/items/weapons/cards_ids.dm
code/modules/mining/materials.dm
code/modules/mining/mine_turfs.dm
code/modules/mining/ores_coins.dm
code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
code/modules/projectiles/ammunition/bullets.dm
code/modules/projectiles/guns/energy/special.dm
compare_report_tg.txt
icons/obj/device.dmi
icons/obj/mining.dmi
icons/obj/vehicles.dmi
maps/tgstation.2.1.0.0.1.dmm
maps/vgstation1.0.0.dmm
2014-02-16 04:40:18 -05:00
a1656037e4
New guns and gun sprites
2013-12-28 10:46:48 -05:00
d4055a89af
Buckshot whee!
2013-12-12 22:10:33 -05:00
a227fa6cbe
Removed zombies, added Skellingtons for halloween. Some bug fixes
2013-10-31 03:21:34 -04:00
7048545d6d
Projectile code overhaul
2013-10-30 10:32:21 -04:00
52b1ed2a25
Updated blank shotgun shells to birdshot
2013-10-04 02:58:38 -04:00
b0aff645a3
Massive traitor item overhaul
2013-09-23 05:41:53 -04:00
c1222034ee
BS12 -> Ponies merge
2013-09-09 10:51:16 -04:00
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
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
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
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
Fox McCloud