Commit Graph

14295 Commits

Author SHA1 Message Date
Razharas 29730ce479 Merge pull request #9412 from RemieRichards/ReactionaryExplosions
Ports VG's DeityLink's new explosion method
2015-06-13 04:45:23 +03:00
Razharas 486888f801 Merge pull request #9630 from AnturK/vv_assoc
Fixes varediting associative lists
2015-06-13 04:44:24 +03:00
Razharas b7150068cc Merge pull request #9783 from nukeop/master
Adds a chemistry bag for moving large amounts of patches/pills/bottles at once
2015-06-13 04:42:16 +03:00
Razharas 6d0c3840ab Merge pull request #9882 from MrStonedOne/mctweaks
Tweaks MC's dynamic rate system a bit. Lowers lag from singulo getting released.
2015-06-13 04:37:00 +03:00
Razharas 35962f343d Merge pull request #9169 from Xhuis/sorry_goofball
Reverts goonchem, ports baymed, and adds physdesc feature
2015-06-13 04:31:07 +03:00
Razharas 4373f6eece Merge pull request #9904 from xxalpha/runtimesrun
Fixes three runtimes.
2015-06-13 04:29:20 +03:00
Razharas 9b22a123f4 Merge pull request #9891 from Iamgoofball/constructionjunctionwhatsyourfunction
Fixes cloners and portachems not working right with tier 4
2015-06-13 04:26:55 +03:00
Razharas 7902457ec1 Merge pull request #9893 from Iamgoofball/patch-76
removes RNG from emagging cyborgs
2015-06-13 04:25:42 +03:00
Razharas ec6c0465b5 Merge pull request #9879 from Incoming5643/skeleton_man
Magic Mania 1.91: Life's a lich and then you rework the mechanic to be less terrible
2015-06-13 04:24:38 +03:00
Razharas ccf7e02f2c Merge pull request #9909 from Iamgoofball/patch-79
"IT'S ONLY LOGGING, WHAT'S THE WORST THAT COULD HAPPEN???"
2015-06-13 04:15:04 +03:00
Iamgoofball 7b475df05e removes the do_after() from emagging apcs 2015-06-12 15:49:22 -07:00
Iamgoofball a19e95dba5 Removes RNG chance to fail to emag an APC
literally why was this a thing

see the pr that removes it from borgs for reasoning
2015-06-12 14:59:05 -07:00
Firecage 97fc115f0e Fixes spider verbs which I broke. 2015-06-12 13:55:03 +02:00
Ikarrus d2ef043690 Resolved Conflicts:
code/modules/mob/living/living.dm
2015-06-11 23:46:59 -06:00
Ikarrus 351fa89c3a - Renamed tommy guns and made them w_class 5. They're powerful as hell, so they're going to have to be non-concealable. (+3 squashed commit)
Squashed commit:

[acab7ea] - Gang messages distinct between bosses and lieutenants.
- Initial gang points reduced to 25 so they can't buy a pen right away

[140e599] 20 -> 10

[b03fbba] Bulletproof vest + Bugfixes (+1 squashed commits)

Squashed commits:

[b03fbba] Bulletproof vest + Bugfixes
2015-06-11 23:42:08 -06:00
Incoming 595bb0c8e4 Generalizes lizard parts to "features" for future non-lizard fields, at the same time merging mutant color into this list
Random lizard bodies will finally have color!

Pushes features almost all the way to the DNA side of thing, the mob side is only needed during character creation.

Note that changes to the save file will invoke a one time per character runtime for legacy characters as the save file purges mutant_color, this is as far as I can tell harmless, has no effect on the player, and is self correcting.
2015-06-12 00:43:35 -04:00
MrPerson 20a2e98f8d Put the AI's static on top of lighting again
Fixes #9884
Lights are layer 15, for reference. I think they used to be 12.
2015-06-11 20:35:50 -07:00
Iamgoofball 532d992b02 "IT'S ONLY LOGGING, WHAT'S THE WORST THAT COULD HAPPEN???"
famous last words

merge asap
2015-06-11 16:07:22 -07:00
AnturK 951546c624 Whispers Hallucination
Minor Adjustments
Scaling hallucinations
2015-06-12 00:59:44 +02:00
xxalpha 9ba7e6aaf4 Fixes three runtimes.
Better fix. src. purge
2015-06-11 21:30:13 +01:00
Cheridan 7363088cbc Merge pull request #9802 from Miauw62/AyeEye
Nerfs the AI in several minor ways.
2015-06-11 14:13:52 -05:00
Miauw cc05c8f206 Makes AI tracking work. OO-ifies trackability. 2015-06-11 19:33:19 +02:00
Cheridan 96f14d49bf Merge pull request #9806 from kingofkosmos/blendershake
Blender, food processor and gibber shaking when processing.
2015-06-11 10:58:38 -05:00
Remie Richards d72cb4bdf1 Merge branch 'master' of https://github.com/tgstation/-tg-station into ReactionaryExplosions
Conflicts:
	code/game/machinery/doors/poddoor.dm
	code/game/turfs/simulated/floor/plating.dm
	code/game/turfs/unsimulated/walls.dm
	code/modules/admin/admin_verbs.dm
2015-06-11 16:23:45 +01:00
Miauw a881478743 Removes strip_html_properly(), replaces it with html_encode().
It was not as proper as the name would imply, and experience and amused redditors have taught me that writing a proper HTML-scrubbing function is a very hard task indeed.
2015-06-11 15:37:41 +02:00
Remie Richards debb7da66b Merge pull request #9588 from AnturK/build_area
Adds map generators to build mode
2015-06-11 12:50:20 +01:00
Ikarrus 59d9098d26 Gang Update 2015-06-10 23:05:58 -06:00
Razharas 4ce96c52ef Merge pull request #9875 from Iamgoofball/logs
Adds feedback gathering for a hell of a lot more things.
2015-06-11 07:30:57 +03:00
Iamgoofball 51d42e90e8 removes RNG from emagging cyborgs
literally WHY was this a thing oh my god it's so fucking annoying
2015-06-10 20:53:25 -07:00
Iamgoofball 302e97a138 Fixes cloners and portachems not working right with tier 4 2015-06-10 18:41:57 -07:00
Iamgoofball b3733df367 logs item attacking 2015-06-10 18:00:45 -07:00
Iamgoofball a58cebbcce fixes problems 2015-06-10 17:33:35 -07:00
Razharas 6b83b0aa8f Merge pull request #9360 from xxalpha/aifixmaybe
Fixed AI seeing more than it should when the Eye is moved to the Core.
2015-06-11 03:08:20 +03:00
Razharas 6f624b79df Merge pull request #9139 from Xhuis/pray_4_fun
Adds prayer sounds to admins + prioritizes chaplain prayers
2015-06-11 02:58:46 +03:00
Razharas 0dc52a4bc5 Merge pull request #9861 from MrStonedOne/patch-16
fixes readmin when username had upper case letters
2015-06-11 02:27:26 +03:00
Xhuis 50e49d1136 FEATURES SIX AND SEVEN: Suicide msg's and cloaks 2015-06-10 14:17:38 -04:00
kingofkosmos 7a952b9310 Merge branch 'master' of https://github.com/tgstation/-tg-station into blendershake
Conflicts:
	code/modules/food&drinks/kitchen machinery/gibber.dm
	code/modules/food&drinks/kitchen machinery/processor.dm
2015-06-10 20:48:22 +03:00
kingofkosmos 0933012ff6 Combined the two offset-lines into one line. 2015-06-10 19:43:45 +03:00
kingofkosmos 607ed1cbb8 Made all shakeys shake around themselves instead of shaking only to the right. Added shaking to blender's juicing process. Simplified the return-to-its-normal-spot line. 2015-06-10 19:43:44 +03:00
kingofkosmos 292c14eafb Made shaking faster. Added shaking to monkey recycler. Added juicer.ogg to the gibber. 2015-06-10 19:43:44 +03:00
kingofkosmos 06e98a1e86 Blender, food processor and gibber shaking when processing. 2015-06-10 19:43:44 +03:00
Cheridan 33e2991011 Merge pull request #9712 from Firecage/deadspiderwebbing
Makes the giant spider verbs not work if dead.
2015-06-10 10:34:20 -05:00
Miauw a34641bb6f Makes AI in-progress tracks not cancel if the AI moves. 2015-06-10 17:14:22 +02:00
MrStonedOne 14b258c655 Tweaks MC's dynamic rate system a bit
The MC will now track the total cost of all subsytems (normalized out to a per second cost number so that subsystems that only run every 10 minutes but are costly (looking at you server tasks) aren't accounting for 90% of the number when they shouldn't.)

This is now used in the dynamic wait subsystems to ensure they slow down when other things are being lagging

This mainly means that air won't lag things if the singulo gets free.

I also tweaked the scaling curve used by the dynamic wait system so that it scales less during slight lag, but much more during higher lag times.

I added qdel to the dynamic wait subsystem with a really high scale. This didn't make sense before, because it limits its run time, but now it can scale back how often it runs when the other subsystems are being laggy. I also lowered qdel's max runtime from 2ds to 1ds, because deletes take 0.9 ds on avg, so it would end up running for 2.9ds often.

This should prevent air+singulo+qdel causing excessive amounts of lag.
2015-06-10 05:04:56 -07:00
Jordie0608 77b2e54de7 code improvement and overlays for fancy storage, dropper, syringe and lighter 2015-06-10 18:58:19 +10:00
Incoming 1f0097a74a Adds the bind soul spell for wizards. It turns them into a lich (skeleton) and gives them access to a long cooldown ressurection spell (starts at 3 minutes).
The ressurection spell can only be used while dead/dying and charges at all times. When used the lich gains a new body at the site of their phylactery and is stunned for a short while. Meanwhile the old wizard body crumbles to dust leaving all the wizards worldly possessions on the ground. Anyone who sees the corpse crumble will also get a cardinal direction pointing towards the wizard.

Every time the wizard dies this way, the time between ressurections is increased by a minute. To take a lich out of the game for good, either destroy the body before the lich can cast the spell again, or destory the phylactery and kill the wizard one last time.

Liches spawn with robes and spells intact, but nothing else, everything collected on their original body stays there.

As a balance issue, this spell can't be used in the den, the item must be bound after arriving at the station.

Adds a nice black wizard robe ensemble for liches.

Magic mirrors (save for a special badmin only one) can no longer skeletonize people.

Adds a hopeful mulligan fix to wizard rounds problems. Also corrects an adminlog message.
2015-06-10 03:40:14 -04:00
Iamgoofball f992eb1af0 Adds feedback gathering for a hell of a lot more things. 2015-06-09 21:52:46 -07:00
Razharas b873176a77 Merge pull request #9821 from Cheridan/just_cuff_my_shit_up
REMOVES CABLE CUFFS...
2015-06-10 01:17:35 +03:00
Razharas 82829ef619 Fixing merge conflicts
Fixing merge conflicts
2015-06-10 00:42:10 +03:00
Cheridan 4f495f1d93 Merge pull request #9833 from Iamgoofball/patch-75
Adds trekchems to the Mediborgs.
2015-06-09 16:27:32 -05:00