Commit Graph

881 Commits

Author SHA1 Message Date
Xhuis
1178fbe079 Major cult changes
The current code for runes is god-awful. Like, seriously terrible. This PR aims to fix that. Rather than having every rune effect defined in a single attack_hand proc, this PR will separate the runes into subtypes, which supports for more modular runes as well as cleans up the code.

It also separates invocation into a two different procs. The first of these will determine if the rune can be invoked; if that passes, the second will cause the rune's effects. There is also a third proc that will cause effects if the rune fails to invoke.

Research words have been removed, and all runes are now available from the start of the round. This is highly subject to change once some feedback is in from actual cult rounds.

Miscellaneous tweaks:

    Blood boil runes now explode when used
    Convert runes can now work solo, but take time
    Armor runes now only provide the basic armor set
    Tomes now do a static 15 burn damage and play a sound
    If the Escape objective is rolled, the amount of people that must escape will scale with the round population to a factor of 5 (i.e. 50 players = 10 cultists)
2015-09-16 10:04:49 +12:00
Razharas
73db85100c Merge pull request #11769 from phil235/FixMutations
Some dna fixes
2015-09-15 22:31:59 +03:00
phil235
428a28a440 Fixes monkeyize/humanize removing the mob's viruses when they should be kept.
Fixes NOCLONE and CLUMSY being in both disabilities and mutations. they're now only disabilities.
Fixes minttoxin not gibbing people with the fat disabilities.
Fixes some runtimes, replacing usr by user in some places.
Fixes mutation overlays being removed when updating overlays.
Remove the now unused mob/var/list/mutations and human/var/blood_type
Fixed some formatting in preferences.dm
2015-09-13 22:52:38 +02:00
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Remie Richards
8b899636b2 Merge pull request #11604 from duncathan/itwaslessthan300000runtimessofranklyIammorethanokwiththis
Fixes a BUNCH of atmos shit
2015-09-07 13:49:01 +01:00
Razharas
580e889e7d Merge pull request #11590 from joonoro/turbinefix
Fix turbine
2015-09-07 00:08:30 +03:00
duncathan
50fc7578f7 fixes TEG 2015-09-06 13:16:00 -06:00
Joonatan O'Rourke
ecbae74695 fix turbine computer 2015-09-05 10:45:57 +03:00
Joonatan O'Rourke
77d91af82c fix turbine 2015-09-05 09:42:14 +03:00
c0
df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
Aranclanos
d2903d077f Merge pull request #11530 from xxalpha/coilcablecorrection
Fixed a couple of bugs with cable coils.
2015-09-02 22:55:47 -03:00
Razharas
feb3d2adce Fixes comment
Fixes comment
2015-09-02 14:41:27 +03:00
Razharas
e0e5bbc978 Merge branch 'DSStuff' of git://github.com/Steelpoint/-tg-station into Steelpoint-DSStuff 2015-09-02 14:38:07 +03:00
xxalpha
70d97ad5e4 Fixed a couple of bugs with cable coils. 2015-09-01 22:35:04 +01:00
Razharas
c94085dcbe Merge pull request #11489 from Core0verload/turbine
Fixes roundstart turbine spawning broken
2015-09-01 17:39:03 +03:00
Razharas
bfbe4e997e Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE
Makes all Destroy() procs return properly
2015-09-01 15:54:18 +03:00
Razharas
40bdd7e1eb Merge pull request #11488 from bgobandit/smeslogging
Adds fingerprint transfer for machine deconstruction; logs SMES
2015-09-01 09:50:57 +03:00
duncathan
51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
Razharas
d1c417e996 Merge pull request #11416 from xxalpha/airlockQDEL
Added qdel(wires) to a bunch of objects Destroy proc.
2015-08-31 00:08:27 +03:00
c0
53d7b4a617 Turbine fix 2015-08-30 22:55:48 +03:00
bgobandit
d4e058c7ea HONK HONK HONK HONK HONK 2015-08-30 15:08:54 -04:00
bgobandit
504f2b7270 Adds fingerprint transfer for machine deconstruction and logging for SMES in particular. 2015-08-30 14:58:21 -04:00
Cheridan
32d74ad19c Merge pull request #11433 from Core0verload/framed
Buttons and wall frames rework
2015-08-30 13:43:19 -05:00
c0
97b792bbc3 Changed some circuits paths to reduce copypasta 2015-08-30 16:58:13 +03:00
Maarten van den Berg
3430e8824e Prevents emitters and field gens from being wrenched to the floor in space 2015-08-28 13:33:31 +02:00
c0
8474086bce Buttons and wall frames rework 2015-08-28 02:01:49 +03:00
xxalpha
19947d4fa0 Added qdel(wires) to a bunch of objects Destroy proc.
Return ..()
2015-08-27 11:10:58 +01:00
phil235
d211992ddc Make it so the code doesn't rebuild (propagate_network()) the wire network X times when singulo/explosion destroys a line of X cables at once. 2015-08-25 20:22:30 +02:00
Remie Richards
ca91b43f0a Merge pull request #11258 from Anonus/spoopyghosts
Fixes a bunch of revenant stuff, again.
2015-08-19 16:15:03 +01:00
Swag McYolosteinen
825b5794c7 Merge pull request #11239 from Firecage/del2qdel
del() to qdel()
2015-08-19 11:50:24 +02:00
Nerd Lord
eb30a83028 Splits defile into two abilities, Defile and Malfunction. Harvest now can be activated by clicking the target while in range.
Defile affects a 7x7 area, damaging windows, tiring humans, and corrupting tiles.
Malfunction affects a 9x9 area, emagging bots, disabling cyborgs, and emping or emagging machines.
Defile and Overload Lights now briefly stun you so you can't just trigger and run instantly.
Fixed a bunch of Harvest bugs.
2015-08-17 23:11:16 -04:00
Firecage
dfae1e0b53 Changes a lot of del() to qdel() 2015-08-16 23:33:22 +02:00
Cheridan
5979ffdec7 Logging Syntax Improvement 2015-08-13 12:14:14 -05:00
Steelpoint
8740dae264 Fix 2015-07-24 16:40:27 +08:00
Steelpoint
66db30a73c RifleBuff 2015-07-24 16:11:59 +08:00
phil235
b5dee0558f Merge pull request #10658 from xxalpha/fixsomething
Fixed solar assemblies not dropping into the solar panel on construct…
2015-07-23 01:50:05 +02:00
xxalpha
369154a8d8 Fixed infinite solar panel exploit.
Fixed being able to anchor solar assemblies in space.
2015-07-21 04:01:40 +01:00
Cheridan
cbe76ea2c0 Merge pull request #10598 from phil235/CatchThrownPieFix
Changes to throwing
2015-07-20 20:26:35 -05:00
MrStonedOne
19ef482d87 Finishes carnmc's shuttle rotation feature.
Under carn shuttles, When shuttles dock at a docking port that is not the same direction as them, they rotate their bounding box, and they do magic i don't understand to rotate where the turfs get placed.

But it doesn't rotate the items or smoothwall or handle pixel_xy or any of that.

This fixes that.

Shuttle rotation will call /atom/proc/shuttleRotate(degrees)
Default behavior handles most cases, and overrides handle edge cases.

Shuttle walls don't smooth wall or obey directions, so I just rotate their icon using matrix transform, its dirty but it works.

See: https://tgstation13.org/msoshit/powrightinthekisser.png or https://tgstation13.org/msoshit/fuckingshuttles.png
2015-07-20 04:28:45 -07:00
phil235
94d072828f Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix
Conflicts:
	code/game/atoms_movable.dm
	code/game/objects/items/weapons/dice.dm
	code/game/objects/weapons.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/living_defines.dm
	code/modules/reagents/reagent_containers.dm
2015-07-19 21:53:39 +02:00
phil235
34db8dd695 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
Conflicts:
	code/game/mecha/equipment/mecha_equipment.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/game/mecha/mecha.dm
2015-07-16 13:50:01 +02:00
duncathan
ae417d2a03 Merge branch 'master' of https://github.com/tgstation/-tg-station into atmosrefactor2
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
	code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/trinary_devices/filter.dm
	code/ATMOSPHERICS/components/trinary_devices/mixer.dm
	code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
	code/ATMOSPHERICS/components/unary_devices/Freezer.dm
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/ATMOSPHERICS/components/unary_devices/unary_base.dm
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
	code/modules/events/vent_clog.dm
	code/modules/mob/living/carbon/human/species.dm
	config/admins.txt
2015-07-16 04:27:25 -06:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
phil235
359a270de6 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
Conflicts:
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
2015-07-14 01:20:37 +02:00
phil235
b570af6795 Fixed catching banana creampie in mid throw (and similar objs). 3824 10536 (hitting a wall now makes the smashed pie effect appear ON the wall)
Moved last_bumped var from movable to living.
Renamed /obj/machinery/field/proc/bump to bump_field() to avoid confusion with Bump(). Same thing with /obj/effect/mine/Bumped() -> triggermine().
Fixes sprite when hunter leaps into a wall. 10428
Removed some commented code here and there.
Remove allow_spin var, throw_at now uses a spin argument for that.
Throwpass atom var is no longer used to check whether thrown stuff can pass stuff (now using CanPass() proc like everything else), the var is still used for some adjacency click check.
A thrown mob hitting another mob now produces a sound; also thrown mob and target one no longer swap places even on help intent.
A thrown mob now is lightly hurt (and weakened) if he hits a wall/mob/dense object. Nerf the damage when thrown mob hit wall.(20 -> 10)
Thrown obj/mob no longer bounces off wall unless it's no grav. Heavy thrown items now push an unanchored obj/mob target.
Fixes losing all momentum when getting out of a thrown closet. 6569
A lot of work on throw_at, throw_impact, and hitby to make the code more OOP. Thrown items no longer collide with border items on the side. 10479
Fixes the killer crusher. 10507
2015-07-14 00:51:19 +02:00
duncathan
71ac607a6b Revert "merge conflicts?"
I fucked this up
2015-07-12 12:52:32 -06:00
duncathan
27f4bf3ee0 merge conflicts? 2015-07-11 19:56:54 -06:00
Cheridan
a0a20b0b0a Merge pull request #10484 from Ikarrus/augmaintenance
Makes augmentations more difficult to maintain
2015-07-11 19:54:58 -05:00
duncathan
e074fb7856 makes air flow; fixes EVERYTHING 2015-07-11 18:45:19 -06:00
WJohn
dee7423b00 Merge pull request #10480 from Chiefwaffles/CELLS_ARE_HARD
Change w_class of Power Cells from 3.0 to 2
2015-07-11 20:25:14 -04:00