cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 18:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,961 Commits 7 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

266 Commits

Author SHA1 Message Date
Yoshax
6db7f306c0 Removes self-recharge 2016-06-17 21:53:26 +01:00
Yoshax
1856897894 Heavy weapons changes 2016-06-10 18:34:58 +01:00
Datraen
a5c615cbd1 Merge pull request #1872 from Anewbe/energy_burst_change 
Tweaks FM-2t to possibly be usable
 2016-06-05 13:58:32 -04:00
Anewbe
cdb5966576 Tweaks FM-2t to possibly be usable, fixes its single-shot mode, too 2016-06-03 23:58:00 -05:00
Spades
ff87150c3d Let's just have the one commit this time because I'm no longer paranoid of losing progress. 2016-06-01 12:48:48 -04:00
Neerti
cbd4915420 Merge pull request #1592 from Anewbe/borg_changes 
Various Borg Changes
 2016-05-28 12:44:27 -04:00
Anewbe
d2b43bd5a4 Prevents the Robocalypse 2016-05-22 14:51:35 -05:00
Datraen
3fb4620199 Merge pull request #1395 from ParadoxSpace/BuffsAdminGuns 
Buffs Back Pulse Rifles
 2016-05-11 01:51:13 -04:00
Anewbe
ac3ce2e7d1 Makes borgs more versatile 2016-05-07 23:52:03 -05:00
Neerti
3c92193bf5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/30/2016_dumb_gun_balance 
# Conflicts resolved:
#	code/modules/projectiles/projectile/beams.dm
 2016-04-20 05:41:36 -04:00
ParadoxSpace
582fd09624 Update pulse.dm 2016-04-09 18:09:35 -06:00
Neerti
25c04df5bd Polaris tweaks. 
Fixes mistake involving belts.
Fixes mistake involving bags allowing w_class 5 items, which was from the manual merge.
Polaris tweaks

Makes inflatables w_class 3.
Spacesuits and RIGs are now w_class 5.
Both sniper weapons are now w_class 5.
Makes more inventories able to use the volume based system.
Cleans up the cig part of the port a bit.
 2016-04-06 07:48:09 -04:00
Neerti
75c0c5cc38 Changes lots of gun stuff, see PR for details. 2016-03-30 03:41:54 -04:00
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Dibasic
6b77ec868e antique laser description typo fix 
there wasn't a period this adds a period
 2016-01-16 18:02:41 -06: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
Neerti
05ec2e7c28 Fixes gun mode switching. 2015-11-19 07:27:34 -05:00
Mark9013100
488ebc89b2 Balances fm-t2, nerfs burstfire 
Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
 2015-10-11 00:42:26 -04:00
Neerti
e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015 
Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme
 2015-10-10 23:17:26 -04: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
Neerti
3a5412df3a Merge pull request #190 from PolarisSS13/master 
Master to Dev 9/6/2015
 2015-09-06 17:30:54 -04:00
Neerti
0451544692 Update nuclear.dm 2015-09-06 16:43:25 -04:00
Neerti
b93595c19f Merge branch 'master' into 9/4/2015_master_to_dev 
Conflicts:
	code/game/jobs/job/security.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	maps/colony-1.dmm
	maps/colony-5.dmm
 2015-09-04 08:43:37 -04:00
SinTwo
4e360779ed Guns, Coats, and Hair Oh My 
Hair gender fix, the attack of the multicolor labcoats and hoodies, and
the addition of a new SMG E-Gun.
 2015-09-03 19:51:26 -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