Commit Graph

544 Commits

Author SHA1 Message Date
Cheridan 793243763d Merge pull request #7185 from paprka/inhandrefactor
Inhand refactor
2015-01-20 22:16:06 -06:00
Cheridan 29af018796 Some fixes
-Fixes magic wands having electronic firing pins, now have FANCY CRYSTAL SHARDS
-Fixes grammer issue.
-Fixes code not compiling due to outdated proc
2015-01-20 21:41:36 -06:00
Swag McYolosteinen 63cb7dad4a Merge pull request #7145 from paprka/gunsicons
splits gun.dmi up into multiple files
2015-01-20 17:56:41 +01:00
paprka f58096575c refactors guns 2015-01-18 23:28:24 -08:00
paprka 88230fabfa inhand refactor 2015-01-18 20:58:31 -08:00
paprka a2fe7f0352 bloat killer 9000 2015-01-17 16:36:27 -08:00
paprka 1b6831dab1 splits gun.dmi up into multiple files 2015-01-17 15:34:30 -08:00
paprka 4a0aa0c0a5 Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/modules/projectiles/ammunition/ammo_casings.dm
	code/modules/projectiles/ammunition/boxes.dm
	icons/obj/ammo.dmi
	icons/obj/gun.dmi
2015-01-15 22:16:11 -08:00
tkdrg 6bfebf2e48 Adds bolt-action rifle
Sprites from https://tgstation13.org/phpBB/viewtopic.php?f=9&t=2151

These have a bolt that needs to be worked after each shot, and they
need it to be open in order to be reloaded. There is also a stripper
clip. Their bullet does 60 brute damage, and the gun has a 5-shot
internal magazine. They cannot be worn on the back slot as there are
no back sprites provided in that file. Bayonets are not implemented
for the same reason.

The gun can be obtained as a 50% drop from ranged russian mobs (the
other 50% still drop the mateba) and from summon guns.
2015-01-16 03:03:34 -03:00
paprka ab7d50c90e Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/modules/projectiles/guns/projectile/launchers.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	code/modules/research/designs/weapon_designs.dm
	icons/obj/gun.dmi
2015-01-15 21:56:23 -08:00
Cheridan 63e09d0928 Merge pull request #6966 from Steelpoint/ERTv2
[FEATURE] Emergency Response Team V2
2015-01-15 23:41:20 -06:00
Cheridan ea4b5b2872 Merge branch 'pinned' of https://github.com/Cheridan/-tg-station into pinned 2015-01-15 16:17:51 -06:00
Cheridan 5f46ebe2b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned 2015-01-15 16:14:27 -06:00
phil235 bd189431d0 Merge pull request #7002 from Menshin/gunlights_runtimes_fix
Fixes "Toggle Gunlight" verb runtimes
2015-01-14 17:29:15 +01:00
paprka 2fd8b3e749 nerfed saber slightly 2015-01-13 20:05:37 -08:00
paprka 8bde2dea03 crossbow, speargun, and grenade updates 2015-01-13 20:00:58 -08:00
Steelpoint 3f88acb6f6 Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2
Conflicts:
	icons/mob/head.dmi
2015-01-14 11:25:07 +08:00
Cheridan 7f46070abf Update pins.dm
-name change for muh fluff
-i am in paprika's pocket
2015-01-13 02:57:08 -06:00
Cheridan c81eada938 Merge pull request #6737 from tkdrg/hurr
Changes the practice beam name to "practice laser"
2015-01-13 02:13:38 -06:00
Cheridan f8e1fac30c Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned 2015-01-12 21:29:00 -06:00
Cheridan 03e1d0d60a -Adds firing pin box define
-Examining a gun now shows its pin
-You can now emag a firing pin to make it function without checks.
-Loyalty pins unable to be constructed
2015-01-12 21:21:34 -06:00
Menshin 0582d87a08 * Fixes "Toggle Gunlight" verb runtimes for guns without any light.
* The verb will now only appear if there's a gunlight attached to the gun.
2015-01-13 00:30:54 +01:00
Steelpoint 982c54c2f3 EmergencyResponseTeamV2 2015-01-11 19:21:38 +08:00
tkdrg 3f802d1ae4 Merge pull request #6917 from Nienhaus/FoxV2
Fox 2.0
2015-01-10 20:38:58 -03:00
tkdrg b0635993a4 Revert "[FEATURE] Emergency Response Team" 2015-01-10 19:55:30 -03:00
tkdrg 1756bfc3f0 Merge pull request #6913 from paprka/secborg
Hybrid taser / Cyborg taser hotfix
2015-01-10 17:59:27 -03:00
Cheridan 0956a86c22 Firing Pin System - The Lockbox Solution 2015-01-09 18:49:02 -06:00
Nienhaus 4d34f2235e Fox 2.0
https://github.com/tgstation/-tg-station/pull/6489/
2015-01-09 16:41:37 -06:00
paprka b201c9211e advanced / cyborg taser hotfix 2015-01-09 09:51:03 -08:00
Steelpoint 34589f52bf Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
Conflicts:
	code/modules/projectiles/guns/energy/nuclear.dm
	icons/obj/gun.dmi
2015-01-09 11:02:50 +08:00
tkdrg 778eb28c15 Repaths practice laser
It's now /obj/item/projectile/beam/practice to inherit laser stuff.
2015-01-07 04:45:49 -03:00
Steelpoint ec821c33d2 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
Conflicts:
	_maps/map_files/generic/z2.dmm
	code/_globalvars/lists/mapping.dm
2015-01-06 12:17:29 +08:00
paprka 0cd34c9c2f changes syndicate borg equipment 2015-01-05 19:42:31 -08:00
paprka f0712db606 Merge branch 'master' of https://github.com/tgstation/-tg-station into gunchangesv2baby
Conflicts:
	code/modules/projectiles/guns/energy/stun.dm
2015-01-05 18:43:46 -08:00
carnie a3f5e7ebfd Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm
2015-01-04 01:52:14 +00:00
paprka 460a06e683 Reverted some other magazine name changes 2015-01-03 17:23:31 -08:00
paprka 7324891c37 intense p90 fans on /tg/ apparently 2015-01-03 17:21:23 -08:00
paprka 8527f23d85 Merge branch 'master' of https://github.com/tgstation/-tg-station into gunchangesv2baby 2015-01-03 17:05:27 -08:00
Menshin ea6d74992f Fixed a typo that can prevent gun firing message from appearing. 2015-01-02 17:51:34 +01:00
paprka 31ab0a137d added seclite removing 2015-01-01 22:50:33 -08:00
paprka 46ee047404 further changes to the ranged stun system 2015-01-01 22:22:03 -08:00
tkdrg a0bbf25dda Changes the practice beam name to "practice laser"
Fixes #6729
2015-01-01 17:49:12 -03:00
Steelpoint 087ab6b415 MinorSpriteFix+CentcomHeadset+GunWeightChange 2015-01-01 15:13:06 +08:00
Steelpoint 8ce0055f14 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
Conflicts:
	icons/obj/gun.dmi
2015-01-01 13:35:29 +08:00
Steelpoint f72ced26fd PulseRifleVarients+ArmouryRooms+FixesAndRefinements 2015-01-01 13:33:23 +08:00
tkdrg cdb5066502 Merge pull request #6324 from Razharas/GenShit
Added datum mutations
2014-12-31 17:24:15 -03:00
carnie e7519a33c8 Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems 2014-12-31 20:22:32 +00:00
carnie a029a49392 SubSystem rewrite
Misc:

+Fixes unreported issue with initializing lighting on a specific zlevel

+Fixes two similar issues with moveElement and moveRange. Where fromIndex or toIndex could be adjusted incorrectly in certain conditions. Potentially causing bad-sorts, or out of bound errors.

+Rewrites listclearnulls(list/L) to no longer iterate through L.len elements for every null in the list (plus 1). i.e. went from L.len*(number_of_nulls+1) list-element reads (best-case), to L.len list-element reads (worst-case)

+New proc/getElementByVar(list/L, varname, value) which finds the first datum in a list, with a variable named varname, which equals value. You can also feed it atoms instead of lists due to the way the in operator functions.

+Fixes an unreported issue with Yota's list2text rewrite. Under certain conditions, the first element would not be converted into a string. Causing type-mismatch runtimes.

+New global map_ready variable. This is not fully implemented yet, but will be used to avoid duplicate calls to initialize() for map objects.

+All turfs now maintain references to all lights currently illuminating them. This will mean higher memory use unfortunately, due to the huge number of turfs. However, it will speed up updateAffectingLights significantly. I've used list husbandry to reduce baseline memory usage, so it shouldn't be any worse than some past atmos modifications memory-wise.

-Removed 'quadratic lighting', can add this back at some point. Sorry.

+modified the way lum() works slightly, to allow turfs to have overridden delta-lumen. i.e. space cannot be illuminated more than its default ambiance. This allowed removal of some iffy special-snowflake lighting areas implemented by somebody else.

+Lighting images in the dmi can now use arbitrary naming schemes. It is reliant on order now. This allows the dmi to be replaced by simply dropping in a new dmi.

-Removed all subtypes of /area/shuttle. Shuttles now create duplicate 'rooms' of /area/shuttle. (More on this later). This will conflict with most maps. Guide on how to fix to follow.

+All verbs/tools relating to world.tick_lag were refactored to use world.fps. However old config text for setting tick_lag will still work (it converts the value to fps for you)

+MC stats improved using smoothing. They now have their own tab so they dont get in the way when you're playing as an admin.

-removed the push_mob_back stuff due to conflicting changes. Sorry Giacom.

_OK, NOW THE ACTUAL INTERESTING STUFF_

Following systems moved over to subsystem datums:
air_master
garbage_manager
lighting_controller
process_mobs (aka Life())
nanomanager
power
sun
pipenets
AFK kick loops
shuttle_controller (aka emergency shuttle/pods), supply_shuttle and other shuttles
voting
bots
radio
diseases
events
jobs
objects
ticker

Subsystems hooks and variables should be commented fairly in-depth. If anything isn't particularly clear, please make an issue.

Many system-specific global variables have been refactored into

All tickers which previously used world.timeofday now use world.time

some subsystems can iterate before round start. this resolves the issue with votes not working pregame
2014-12-31 13:25:41 +00:00
phil235 183955a877 Fixes shortening barrel: only live chambered ammo goes off in your face; the gun goes off even if not in your hand; when blowing up "you fire the X" message won't show up anymore. 2014-12-31 12:04:39 +01:00
Steelpoint dd111a7c54 EmergencyResponseTeam 2014-12-31 17:31:45 +08:00