Commit Graph

143 Commits

Author SHA1 Message Date
PsiOmegaDelta
12078c48e9 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/__defines/mobs.dm
	code/game/asteroid.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/recycling/disposal.dm
2015-12-13 10:47:33 +01:00
PsiOmegaDelta
f382626075 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm
2015-12-13 10:15:29 +01:00
SkyMarshal
d10118e3d0 Fixes #11346
Fixes #8123

Removes adminbus ability to call down the Icarus... because it's pretty broken.
2015-12-12 12:03:15 -07:00
GinjaNinja32
c8eb26326a Merge pull request #11208 from mwerezak/firemode-cleanup
Fixes #10850
2015-09-28 11:41:03 +01:00
mwerezak
13c184c2a8 Fixes #10850 2015-09-27 14:13:37 -04:00
mwerezak
0cf21df8b5 Adjusts projectile values 2015-08-13 22:37:47 -04:00
Chinsky
94f0ceffe1 Merge pull request #10200 from mwerezak/gun-desc
Renames of various firearms (squashed version)
2015-08-14 03:55:43 +03:00
HarpyEagle
ad54aca3ab Streamlines gun firemodes
Gun firemodes now work by setting vars on the parent gun item. Removes the
need to unpack a bunch of firemode values when shooting and the need for
certain guns to define special firemode types.
2015-08-10 14:38:08 -04:00
Dragor
697157a6bc Changes all gun names to generic descriptive names, moves names into desc. Updates the descriptions of various guns to be more loreful. 2015-07-15 22:08:21 -04:00
PsiOmegaDelta
405131a54e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/guns/projectile/pistol.dm
	code/modules/projectiles/guns/projectile/revolver.dm
2015-06-20 20:40:06 +02:00
HarpyEagle
1ba777f670 Reverses stunrevolver buff 2015-06-17 09:59:39 -04:00
Yoshax
1711d01e7a Makes special wizard projectile staffs only usable by wizards. 2015-06-04 19:42:06 +01:00
Kelenius
35a20002c6 Merge branch 'dev' into ofResearchAndPrototypes
Conflicts:
	baystation12.dme
	code/defines/obj/weapon.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
	code/game/mecha/mecha_parts.dm
	code/game/objects/items/devices/flash.dm
	code/game/objects/items/devices/powersink.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
	code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
	code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
	code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
	code/game/objects/items/weapons/circuitboards/machinery/power.dm
	code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
	code/game/objects/items/weapons/circuitboards/machinery/research.dm
	code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
	code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
	code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
	code/game/objects/items/weapons/flamethrower.dm
	code/game/objects/items/weapons/handcuffs.dm
	code/game/objects/items/weapons/kitchen.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/teleportation.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/assembly/igniter.dm
	code/modules/assembly/infrared.dm
	code/modules/assembly/mousetrap.dm
	code/modules/assembly/proximity.dm
	code/modules/assembly/signaler.dm
	code/modules/assembly/timer.dm
	code/modules/assembly/voice.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/mining/drilling/scanner.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/ore.dm
	code/modules/mob/living/silicon/robot/analyzer.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
	code/modules/research/research.dm
	code/modules/research/server.dm
	code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
2015-05-20 11:50:28 +03:00
Chinsky
e9cc39039c Merge pull request #8946 from Zuhayr/miningstuff
Wall refactor/mining changes.
2015-05-12 13:13:31 +03:00
Zuhayr
495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
Zuhayr
bc50ba5166 Merge resolution. 2015-05-11 11:47:24 +09:30
mwerezak
f3dd96bb8c Adjusts charge costs for gun/energy
In particular, charge costs were chosen so that mounted energy guns
drain 80% of a default rig's power cell in 40 shots, and mounted laser
cannons drain the same in 20 shots.
2015-05-07 00:13:21 -04:00
PsiOmegaDelta
851d5423f3 Merge pull request #8971 from mwerezak/burst-fire
Gun firemode system, burst firing
2015-04-28 20:24:03 +02: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
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
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
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
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
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
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
GinjaNinja32
e342bf8a3a Fixes #8673, also makes some messages clearer and removes the twin cooldowns on rig weapons 2015-03-30 03:54:18 +01:00
mwerezak
c59fac2e16 Adds unloaded item state for the STS-35. 2015-03-29 02:40:57 -04:00
mwerezak
ba9b8756da Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file 2015-03-29 01:52:26 -04:00
mwerezak
36cf695256 Adds Skowron's inhand icons for various guns 2015-03-28 02:10:09 -04:00
Zuhayr
8d698f0c06 First pass on making heist a pirate mode (human based) 2015-03-21 11:13:05 +10:30
mwerezak
8d1a92a0f5 Hardsuit tweaks
Spider fang blade uses power faster.
Light hardsuits (minus ninja suit) have voidsuit-level breach thresholds.
If the suit is malfunctioning when it runs out of power then you will need someone to cut you out.
2015-02-28 14:04:53 -05:00
mwerezak
a026922115 More hardsuit fixes, ion rifle fix
Fixes modules being usable when destroyed.
Fixes charge display for fractional charge values.
Fixes ion rifles EMPing themselves.
2015-02-28 04:15:29 -05:00
mwerezak
7dd82f8763 Merge remote-tracking branch 'upstream/dev-freeze' into backup
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
2015-02-28 03:39:38 -05:00
mwerezak
55a3b94995 Hardsuit adjustments, fixes
Default inherited offline_slowdown set to 3, as most hardsuits use this
value. ERT no longer get rad immunity, they have enough advantages -
instead only ERT engineers get that.
ERT engineer gauntlets are also now insulated, allowing them to do
wiring work in space.
Fixed a compile error.
Fixed mounted laser cannons taking too long to recharge.
2015-02-28 03:36:00 -05:00
Zuhayr
f14922f1f8 Merge pull request #8288 from mwerezak/topicfix
Topic Fixes
2015-02-26 16:28:56 +10:30
mwerezak
ec59f8ab07 Fixes captain's laser gun
Also updates retro laser gun path, as it isn't really conceptually
related to the carbine anymore, and should avoid inheriting things like
fire rate.
2015-02-25 23:35:20 -05:00
mwerezak
6d15809768 Corrects return values for the Topic procs of several computers and some other machines as well. 2015-02-25 21:32:35 -05:00
mwerezak
b067b491a4 Returns the laser carbine capacity to 10 2015-02-25 00:15:08 -05:00
mwerezak
401709cd23 Merge remote-tracking branch 'upstream/dev-freeze' into gun-rewrite 2015-02-24 20:15:18 -05:00
mwerezak
3940c35184 Misc gun tweaks 2015-02-23 18:25:22 -05:00
mwerezak
dfec1fcb5c Improves energy gun charge icon handling, adds ion rifle in-hand sprite. 2015-02-22 21:46:18 -05:00
mwerezak
5bc076cc25 Adds a better placeholder item_state for the ion rifle 2015-02-21 14:25:06 -05:00
Raptor1628
2ae273e1b8 Gear again
Collection of gear and changes from the four gear polls on the forums
includes:
2 new automatic weapons, mapped in to ERT and random weapon spawns.
Laser carbine balance.
Slow emergency softsuits, no armor value other than bio and rad, 4
slowdown.
1 knife, not mapped in, available for Psi's uplink merge.
New vests: 2 types, 2 pocket no slowdown,
4 pocket with slowdown, second is available from cargo and one random
vest
spawn in armory. The first replaces all instances of the old vests. Old
vests still exist in code.
Mercenary vest with no slowdown, 4 pockets, and slightly better armor,
not on map, possibly for Nukes or Traitor Uplink
Holster rearrangement for custom loadout.
Acid dispenser, mapped into robotics and science.
New food items, added to vendors and rations crate.
New random medical spawns, added to medbay.
Cargo and loadout additions to accommodate new items.
1 beanbag loaded 5 round shotgun added to Warden's closet to compensate
for officers having .45 ltls and the HoS having an e-gun, suggested by
IRC and server.

http://baystation12.net/forums/viewtopic.php?f=5&t=12064

http://baystation12.net/forums/viewtopic.php?f=5&t=12031

http://baystation12.net/forums/viewtopic.php?f=5&t=12027

http://baystation12.net/forums/viewtopic.php?f=5&t=12007
2015-02-18 15:35:37 -05:00
mwerezak
c20986b140 Fixes quoted paths 2015-02-16 01:12:43 -05:00
SkyMarshal
03e8acd957 Fixes errors in energy/special.dm 2015-02-15 10:45:34 -07:00
mwerezak
cd81f0b706 Improves gun scope zooming 2015-02-14 22:12:16 -05:00
mwerezak
08635587e1 Fixes revolver paths, span classes, typo. Cleans exodus-1.dmm
Tweaks syringe gun and dart gun, renames syringe gun cartridges and makes them printable.
Adjusts penetration so that passing through mobs happens with a probability that scales with damage.
Adds a .45 signal pistol to the HoP's closet and a 9mm one to the mercenary shuttle.
2015-02-14 13:38:05 -05:00
mwerezak
f8977c65af Much nicer syringe gun implementation
Makes syringe guns a type of launcher gun, and removes the hack
projectile.
Also moves syringe and dart gun source files into the modules/projectile
folder.
2015-02-13 23:48:35 -05:00