Commit Graph

725 Commits

Author SHA1 Message Date
Jordie
562766bdb0 Merge pull request #9129 from Incoming5643/begone_ye_jellies
Some Mutantrace Housekeeping
2015-05-02 23:59:15 +10:00
MrStonedOne
eb7d5fefa5 Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious
Conflicts:
	code/controllers/subsystem/ticker.dm
2015-05-02 03:03:29 -07:00
Cheridan
c947a4bea6 Merge pull request #9221 from Firecage/Grenadelauncherfix
Fixes the grammar error of the Grenade Launcher.
2015-05-01 12:17:09 -05:00
Incoming
7459238065 Merge branch 'master' of https://github.com/tgstation/-tg-station into begone_ye_jellies
Conflicts:
	code/game/machinery/teleporter.dm
2015-04-29 13:37:01 -04:00
MrStonedOne
bd6d51a0b5 Massive MC and subsystem rewrite
MC:
	No longer tracks a subsystem's cpu usage. This was basically worthless and took up space on the stat panel
	Can calculate wait down to a tenth of a decisecond to make it fps/world.ticklag agnostic
	Now allows subsystems to have a dynamic wait, that is based on a ratio of how long that subsystem has been taking to process(cost). (This system allows for upper and lower bounds, and an changeable cost delta for each subsystem)
	MC can now be told to init a zlevel

All Subsystems:
	Stats panel now allows child subsystems to pass it a message to add to its stats entry. All subsystems have been moved over to this system - This should cut down on subsystems having to copy and paste the stats proc in order to add to it
	All subsystems now properlly handle being given a zlevel in their init proc

Subsystem changes:
	Air:
		Added air to the dynamic wait subsystem. upper bound: 50, lower bound: 5, cost delta: 3 times process cost
		Air now fires 4 times faster when it can do so without lagging things up
		Pipenet has been merged into air
		Atmos machinery now processes with process_atmos(), ticked by air, not machinery.
		Hotspots (the fire object) are now object pooled
	Pipenet:
		Deleted, added to air
	Machinery:
		Moved all atmos calcualtions in all objects's process() to process_atmos().
	Lighting:
		Added Lighting to the dynamic wait subsystem. upper bound: 20, lower bound: 5, cost delta: 3 times process cost
	Ticker:
		Fixed ticker not updating the lobby panel when game start delayed
		Fixed the game start timer updating rapidly from queued fires when game start delay is removed
	Garbage/qdel:
		qdel will now limit its process time to 2ds a fire.
		qdel can now be given hints as a return to Destroy() as to what should be done with the object.
		the options are:
			queue: (default) this is the normal behavior.
			letmelive: old default to non-null/zero. does nothing with the object
			iwillgc: functionally the same as above, mainly to let people working with objects know that the object will not be queued for GC checking
			harddel: this will queue the object to be deleted without storing a soft reference, mainly to save locate() processing time.
			harddel_now: this will del() the object. To allow for a clean removal of every del() not in qdel
		All objects have been updated to the new system, harddel and iwillgc was not added to any new objects.
		Fixed some objects not GCing because they didn't properlly clear references in Destory()
		Fixed some objects getting qdel'ed preventing other objects from getting GCed because they did not null their reference to that object.
2015-04-29 02:00:25 -07:00
Firecage
a2070d5c4b Fixes the grammar error of the Grenade Launcher. 2015-04-28 22:27:17 +02:00
Jordie
0c08ffb95e Merge pull request #9183 from GoonOnMoon/ARG1
ARG Assault Rifle Addition
2015-04-28 23:49:33 +10:00
kingofkosmos
761d31cea0 More visible.message span classes removed. 2015-04-24 21:24:21 +03:00
kingofkosmos
de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
kingofkosmos
a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos
3304ffa45f span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos
e371dd9f35 more spans 2015-04-24 20:52:00 +03:00
kingofkosmos
72749392d8 span classes removed from visible.messages 2015-04-24 20:50:51 +03:00
kingofkosmos
1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
Incoming
f59c01e721 sets hardset_dna to clear exotic blood on race changes
sets every instance of race changes to use hardset_dna instead of directly replacing the datum (needs more testing to be sure I didn't break shit)
removes the invisible man race (aka the generic) and shadowlings from the new green slime mutation toxin while I'm in the area
2015-04-23 12:35:37 -04:00
GoonOnMoon
a326594e0f Removes syndie tech origin from the ARG rifle. Adds it to summon guns. 2015-04-20 15:57:39 -05:00
xxalpha
fc8148b496 Fixed syringes being chambered when stored in a backpack. 2015-04-20 21:05:18 +01:00
GoonOnMoon
d1b102361d Adds Nanotrasen's equivalent of the M90 assault rifle to the game: the ARG. Currently only obtainable with badminnery. Uses 5.56mm ammunition.
Added myself to admins.cfg as a coder.

Added new icons for the ARG.
2015-04-20 14:21:40 -05:00
GoonOnMoon
4f8c791145 Adds a new assault rifle for the nanotrasen noobs to use. Currently only available with badminnery. 2015-04-19 23:50:49 -05:00
phil235
a01b8ef435 Reorganizing the reagents files. Goon chems are no longer in separate files.
All reagents are back to being metabolized every tick. I adjusted the goon chem so their effects aren't changed too much.
Removing some probability and randomness from goon chem effects to make it more predictable.
Adding overdose to space drug.
Making a drug reagent category.
Changed check_ear_prot() for carbons: alien are now immune, and monkey checks their head for ear protection.
Changed flashpowder flashing code and blackpowder explosion code to use already existing procs.
Moved chemical_mob_spawn and goon_vortex procs to /datum/chemical_reaction/
Fixes double overdose message for sugar.
Remove the "if(!M) M = holder.my_atom" at the beginning of a lot of on_mob_life procs, you already can't call on_mob_life if M is null

(Chemistry-Holder.dm).
Moved random_color_list to datum/reagent/colorful_reagent
Nerfed healing power of stimulant. Buffed ephedrine a bit.
Fixes some goon chem on_reaction() proc leaving resulting chem behind when they shouldn't.
Removes Life, nitroglycerin and Corgium reagents. They're now only a chemical reaction.
Moved grenade launcher and syringe gun from reagents module folder to gun folder.
Added a message for the ghost when someone is trying to revive its corpse with strange reagent. (like defib)
Fixes Frost oil and other consumable reagents using current_cycle var.
Fixes runtime where during metabolization a reagent removes another then the latter still calls on_mob_life().
2015-04-16 22:07:24 +02:00
phil235
081bae6740 Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
2015-04-14 13:54:36 +02:00
Ikarrus
71d529a6a5 More adjustments
- added unrestricted-use guns
- excluded fake toy guns
- Unexcluded throwing stars
2015-04-11 14:37:21 -06:00
phil235
13baa6e3cb Merge branch 'master' of https://github.com/tgstation/-tg-station into KineticAcceleratorNerf
Conflicts:
	code/modules/projectiles/projectile/special.dm
2015-04-09 17:27:55 +02:00
phil235
7df5998740 Nerfing plasma cutters, their damage and range is reduced in pressurised environment. Reduces drilling cost of all drills to make them appealing. Drill cells are now removed by clicking the drill, no more screwdriver needed. Resonator fields can no longer be stacked on each other. Switching from 5 to 3 seconds detonation on the resonator is now done by clicking it instead of screwdriving. Increasing building costs for plasma cutters. Removes mineral/screwdriver upgrades to resonator and kinetic accelerator. Plasma cutters can now only uses solid plasma. 2015-04-08 03:44:56 +02:00
phil235
d60df6ea2e Merge branch 'master' of https://github.com/tgstation/-tg-station into ProjectileFix1
Conflicts:
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/living_defines.dm
2015-04-07 01:06:38 +02:00
phil235
d0e9a5c0c9 Nerfs the kinetic accelerator.
Remove the plasma upgrade chance of rigging the cell since it doesn't work as intended and can break the KA without any feedback.
2015-04-06 22:43:03 +02:00
kingofkosmos
2e4a8fcce8 Recieve --> receive grammarfix
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.

Fixes #8576
Fixes #8504
2015-04-03 19:42:34 +03:00
phil235
09df1080e9 Some adjustments:
Fixes with projectile bump() on border objects.
Fixes some projectile on_hit() not calling the parent on_hit.
Move projectile mob hit check code to mob/CanPass().
Simplifies projectile/CanPass()
Fixes runtime in projectile/Bump()
2015-04-02 17:39:02 +02:00
phil235
c5b5427b0e Makes projectile non dense. Projectile hitting a dense obj/turf will now also hit one of the mob sitting on that turf/obj's turf.
Adds a has_limb var to mob/living to handle whether to specify the limb that is hit by a projectile or not.
Fixes runtime in handle_changeling.
Adds PASSMOB pass_flag and mob_size small to bees and mouse.
2015-04-01 20:59:42 +02:00
hornygranny
89fd1ba9c4 Merge pull request #8595 from ACCount12/dredd
Firing pins update
2015-03-31 16:34:35 -07:00
ACCount12
f10d0df8cf Merge remote-tracking branch 'origin/master' into mining 2015-03-31 18:31:12 +12:00
ACCount12
1c219f0ebe A lot of stuff 2015-03-31 18:30:09 +12:00
ACCount12
55d4c99da4 Icon change 2015-03-28 22:27:23 +12:00
ACCount12
edace66c47 Fix 2015-03-28 22:15:20 +12:00
ACCount12
fd3f3ab68b New pins 2015-03-28 22:02:44 +12:00
pudl
0964979a90 bitch says she wanna keep her throat warm 2015-03-26 21:16:25 -05:00
pudl
4c51941e6e reverts an accidental change 2015-03-25 21:12:25 -05:00
phil235
1b3eb49a1d Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/slime/say.dm
2015-03-26 02:31:06 +01:00
pudl
69924a15be plasma/ripley update 2015-03-25 18:06:26 -05:00
Jordie
9a217503aa Merge pull request #8451 from Fayrik/FoamForceFuckYeah
Foam force fuck yeah!
2015-03-25 16:30:42 +11:00
phil235
ffd711c26f Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
2015-03-23 16:51:03 +01:00
Cheridan
beacf0cf4a Merge pull request #8349 from MrPerson/qdel_reagents_hopefully
Fix reagent garbage collection hopefully
2015-03-23 08:55:11 -05:00
Fayrik
117d9d11cd Riot darts are now available to Nuke ops and Traitors. And I am SO done with this. 2015-03-22 22:11:56 +00:00
Swag McYolosteinen
53e40ec315 Merge pull request #8427 from Cheridan/day3_collars
Event Day 3 - Pet Collars!
2015-03-22 19:37:12 +01:00
MrPerson
9229f72573 Fix up certain chemicals to not overwrite Del(). Meh.
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_reagents_hopefully

Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
2015-03-21 23:04:53 -07:00
Fayrik
0173c7af6e Adds everything and makes it all work perfectly. It's like I'm almost good at this or something. (Seriously, points of interest: Secbots react to being shot. Dart rigging. Donksoft guns.) 2015-03-21 16:18:32 +00:00
Fayrik
d3d491588e Cleaned up the functionality and prepared things for PR. 2015-03-20 23:19:19 +00:00
Fayrik
57f544ffdf Removed dangerous "hacked" foam darts, as they were a little more powerful than intended. Hopefully this is something I can fix at a later date. Fixed non-magazine ammo boxes not accepting their correct ammo type. Added a speed collection system to all ammo boxes. Finally balanced out the cargo ordering stuff. 2015-03-20 23:19:04 +00:00
Fayrik
a030c9889e Glorious second commit, introducing (mildly) dangerous rounds and a new suicide check. 2015-03-20 23:03:06 +00:00
Fayrik
b758992e8c First (of probably several) commits to add Foam Force toy guns. Adds the new guns and crossbow, removes the old crossbow, and makes these new guns available to cargo. 2015-03-20 23:02:53 +00:00