Commit Graph

1182 Commits

Author SHA1 Message Date
Leo 6bb099a411 Merge pull request #27521 from Cyberboss/patch-90
Removes HasProx testing message
2017-05-23 00:47:15 -03:00
Robustin 5ceb2faaea CultEffect 2017-05-22 11:37:51 -04:00
Cyberboss f87dd5e52f Removes HasProx testing message 2017-05-21 18:33:55 -04:00
Joan Lung de45c268ed Merge pull request #27283 from Robustin/gangclothes
Decentralized and Vastly Improved Gang Influence System
2017-05-20 19:36:51 -04:00
Joan Lung 1b7c4a63dc Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344) 2017-05-17 22:54:54 -05:00
Joan Lung 648e83f481 Adds framework for cult constructs having the ability to make runes (#27266) 2017-05-16 20:13:35 -03:00
TrustyGun ac51badffd Petting is better (#27215) 2017-05-14 09:36:19 -03:00
Iamgoofball 1caf163c51 WHOSE FOOTPRINTS ARE THESE (#27190)
* WHO'S FOOTPRINTS ARE THESE

* Update humans.dm
2017-05-14 00:25:54 +12:00
Robustin 1a76285d1c Decentralization and Gang Clothes 2017-05-12 00:54:09 -04:00
Cyberboss ffbdc49188 Merge branch 'master' of https://github.com/tgstation/tgstation into goonchatv3 2017-05-08 09:23:55 -04:00
Joan Lung f17dd48f94 Merge pull request #26631 from Robustin/CultMasterAttempt2
2017 Cult Overhaul P1:  Cult Master and Datum Cult
2017-05-06 12:55:50 -04:00
Cyberboss bcfeebb060 Merge branch 'master' into goonchatv3 2017-05-05 19:18:25 -04:00
PKPenguin321 c2bfa07473 Revert "Removes the gang gamemode" (#26915) 2017-05-04 21:19:02 -05:00
Leo d6640544ff Merge pull request #26870 from ChangelingRain/mendingcog
Adds an effect to Mending Mantra to show who is chanting it
2017-05-04 19:48:43 -03:00
Robustin 94cd7abce3 Merge branch 'master' into CultMasterAttempt2 2017-05-04 10:41:40 -04:00
oranges 846f31ca52 Merge pull request #26816 from lzimann/badgamemode
Removes the gang gamemode
2017-05-04 23:29:27 +12:00
Joan Lung 2729d025a3 Adds an effect to Mending Mantra to show who is chanting it 2017-05-03 19:10:36 -04:00
Lzimann 68771eae4c Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchatv2 2017-05-03 12:28:28 -03:00
Joan Lung 4d1e3ce607 Merge pull request #26813 from KorPhaeron/librarian
Curator Update
2017-05-03 11:18:15 -04:00
KorPhaeron b7864be38a Curator 2017-05-03 08:08:14 -04:00
Robustin 3423cbeba5 Finally working again 2017-05-02 19:25:49 -04:00
Lzimann 59eed8f11c Removes the gang gamemode 2017-05-02 14:28:55 -03:00
Cyberboss 5fa5e68a42 Fixes proximity sensors not tracking correctly (#26769) 2017-05-02 08:54:47 -06:00
Leo 3b9b4e0755 Changes a bunch of hrefs to the proper defines (#26760) 2017-05-02 01:19:51 -06:00
Really-Good-Soda-Flavor a0459ad410 Moves playsound_local() to mob and gets rid of a useless proc. (#26726)
* playsound_local to mob

* Suggested change
2017-05-01 20:01:55 -06:00
Lzimann f2263cd082 Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchatv2 2017-05-01 00:47:34 -03:00
Robustin 4103871708 Merge branch 'master' of https://github.com/tgstation/tgstation into CMA4
# Conflicts:
#	code/datums/antagonists/datum_cult.dm
#	code/game/gamemodes/cult/cult.dm
#	code/modules/mob/living/simple_animal/constructs.dm
#	icons/mob/actions.dmi
2017-04-30 16:36:36 -04:00
coiax 3a577221d0 Adds new debug verb for highlighting roundstart ATs (#26492)
* Adds new debug verb for highlighting roundstart ATs

Debug -> Debug Verbs enable
then
Mapping -> Show roundstart AT markers

Will highlight AT turfs, for easier location and comprehension rather
than looking at the list of coords. List of coords still works fine
though.
2017-04-28 12:58:34 -03:00
Lzimann 53677a7f7f Fixes conflicts 2017-04-28 08:37:13 -03:00
Robustin 3ffaead7cf Cult Master 2017-04-26 20:14:42 -04:00
oranges d95e859e5d Merge pull request #26386 from ChangelingRain/initialnew
New() goes in the trash, we've gotta Initialize()
2017-04-27 10:15:10 +12:00
Joan Lung 6a31978b5e Drake swooping is smoother and more dangerous (#26543)
* Drake swooping is smoother and more dangerous

* tweaky tweak.

* don't behave like it

* slow it down

* swoop at it
2017-04-25 23:28:14 -05:00
Lzimann 79d9178adf Fix conflicts 2017-04-25 10:51:49 -03:00
Joan Lung 228df13447 Merge branch 'master' of https://github.com/tgstation/tgstation into initialnew
Conflicts:
	code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
	code/modules/station_goals/bsa.dm
	code/modules/vehicles/atv.dm
2017-04-25 07:32:06 -04:00
MrPerson ff3f84ab81 Replaces /image with /mutable_appearance, where appropriate (#26518)
In cases where you're creating an image to use as an overlay, it makes more sense to use a mutable_appearance if you can. The image will create a static appearance for not just the image but also each intermediate step if you change vars along the way. The mutable appearance avoids this unnecessary and expensive process. The only situation that requires an image instead of a mutable_appearance is if the overlay is supposed to be directional. MA's ignore direction while images don't. I dunno why, probably another BYOND-ism.

I added a convenience function, mutable_appearance(), designed to emulate image(). Also went ahead and set the default plane of /mutable_appearance to FLOAT_PLANE because it's fucking 0 by default.

Several overlays that were image() calls were changed to just text strings when I could. overlays += "string" has the same result as overlays += image(icon, "string") and saves a proc call.
2017-04-25 12:15:16 +02:00
Lzimann 2082a248d9 Bicon conversion 2017-04-24 22:12:01 -03:00
Jack Edge 73eaed4cfd No roundstart stuff needed anymore 2017-04-22 22:08:31 +01:00
Jack Edge 133173c67c Removes adhoc types 2017-04-22 22:07:51 +01:00
Jack Edge 4fe95d0459 Fixes easter eggs spawning during non-easter
So I changed lootspawners to Initialize, which caused some code in
easter.dm to start working and added eggs and baskets to maint loot
table.

- The maintenance loot table is now a global list
- The easter event now modifies that global list.
- Maintenance loot spawners now run on roundstart
2017-04-22 22:07:50 +01:00
Joan Lung 59b905f5ef reeeeeeeeeeee 2017-04-22 10:01:50 -04:00
Cyberboss 44898a9b9e Conveyor movement refactor/fix (#26408)
* Refactors conveyor movement

* Fixes effects being affected by conveyors

* Fixes jetpacks not stopping conveyors

* Fixes /mob/dead being affected by conveyors

* Fixes butterflys being affected by conveyors
2017-04-21 19:27:37 -03:00
Cyberboss 011448491e Fixes proximity_checkers being visible in the right click menu (#26367) 2017-04-20 15:52:14 -03:00
Joan Lung db9d86a39e New() goes in the trash, we've gotta Initialize() 2017-04-19 18:22:26 -04:00
Cyberboss 4f14ca7a49 Proximity sensing refactor (#26260)
* New proximity monitor datum

* Replace the old systems

* Fixes #26254

* Ports a New and spawn to Initialize

* Switch to Moved

* Remove unused var

* Speedup and fixes

* More speed

* qdel in movable

* Uneeded now

* Fix

* Use the faster RANGE_TURFS
2017-04-16 14:48:29 -06:00
coiax 7707910eb4 Renames the Cleanable/ folder to cleanable/ (#26007)
* Renames the Cleanable/ folder to cleanable/

* Rename in tgstation.dme as well
2017-04-15 10:45:55 -06:00
Joan Lung f74359e695 Merge pull request #26193 from Robustin/future5
Engimarket 3, The Third III: Fucking Dance Machine
2017-04-14 22:07:02 -04:00
coiax de35ec5f67 Partial sparks boilerplate reduction (#26081)
* Partial sparks boilerplate reduction

- Lots of obects are making `/datum/effect_system/spark_spread`, setting
them up, firing them, and then not qdeling them afterwards.
- Makes a `do_sparks` global proc that takes the same arguments as `set_up`
and then calls `start` and then `qdel`
- Switches a bunch of things to use this proc
- Makes emitters keep their own spark_spread datum around, since they
spark so damn much.
- Also makes some things use timers and ports some things to Initialize.

* Compilation
2017-04-12 19:59:45 +02:00
AnturK 0fb598f55e Some arcade cleanup (#26041) 2017-04-12 09:53:46 -03:00
BeeSting12 71d191e0eb The herpes of arts and crafts. (#26006) 2017-04-09 18:59:41 -03:00
Profakos 22ab7b3031 Ports the remaining few cleanables to Initialize (#25957) 2017-04-08 11:27:56 -03:00