Commit Graph

32 Commits

Author SHA1 Message Date
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Unknown
f68a82b81f Replaces lentext with length 2019-12-12 13:13:18 -05:00
Donut
964cc0e2c1 Musician.dm Fix
The person who did the port from TG flipped the defines around. Whoops.
2019-08-31 10:53:47 -04:00
Repede
e4dd365fe1 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/controllers/subsystems/mapping_vr.dm
#	code/datums/datum.dm
#	code/datums/datumvars.dm
#	code/datums/supplypacks/voidsuits.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/defib.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/world.dm
#	code/modules/client/preference_setup/loadout/loadout_accessories.dm
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
#	code/modules/client/preference_setup/loadout/loadout_head.dm
#	code/modules/client/preference_setup/loadout/loadout_suit.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/food/food/snacks.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	code/world.dm
#	config/custom_items.txt
#	config/example/config.txt
#	config/example/game_options.txt
#	icons/mob/robots.dmi
#	icons/obj/mining.dmi
#	maps/submaps/surface_submaps/wilderness/wilderness.dm
#	vorestation.dme
2019-04-07 19:40:12 -04:00
Neerti
b9adc37685 Standardizes rotation verbs 2019-03-27 03:17:07 -04:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Dwaggy
ffb495a58c Language fix for Akula and Zorren.
-Hopefully this should fix Akula and Zorrens not been able to speak their own languages. Skrell and Terminus.

-'fixed' the musical instruments only limited to 50. changing all instruments to handle at 400..
 - I would have used the var, but..it didn't cooperate with me, i'm probably been really dumb with it, so did it this way instead, instruments are basiclly all spawned in anyway via admin right now.
 - (if someone wants to tell me how to make it work with the var, i'll do that, but the ways i tried, either errored or the game just ignored. so..*eh?*)
2018-10-16 18:12:37 +01:00
Hawk_v3
4e66b1f7c7 Initial merge fixes
Clean Compile, 0E, 0W
2018-10-03 20:08:55 +01:00
Hawk_v3
beb7579ed3 Vore Updates and merges 2018-10-03 18:25:39 +01:00
Poojawa
5d0328d0e5 fixes the trailing tag, I think 2018-09-05 21:42:27 -05:00
Poojawa
6b403022a7 Ports /vg/ instrument frame work, adds client based sound pref
Also shifts sound files which is 98% of the bulk here.
2018-09-05 03:35:34 -05:00
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
Kelshark
85f9061592 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/controllers/autotransfer.dm
#	code/datums/supplypacks/contraband.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/reagents/reagent_containers/food/snacks.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme
2018-01-24 19:52:12 -05:00
BillyBangles
f1280b234b Adds rotate verb for pianos (#4324)
* Adds rotate verb and directional piano sprites

* fixes ghost rotation

I forgot Polaris and Bay handle ghosts quite differently. This should fix that.

* mice and restrained people cannot rotate a piano

i can break these cuffs
2017-11-23 12:58:43 -06:00
Kelshark
f2f35697fb Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/datums/supplypacks/engineering.dm
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	code/modules/vore/appearance/spider_taur_powers_vr.dm
#	code/modules/vore/resizing/resize_vr.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
2017-08-18 08:14:12 -04:00
Neerti
99eb6f9404 Updates Tools
Adds toolspeed var, which is a multiplier on how 'fast' the tool works.  0.5 means it goes twice as fast.
Adds usesound var, which determines what sound is used when a tool is being used.
Changes a lot of code to use those two vars instead.
Adds 'ayyy' tools, which are ported from /tg/'s abductor gamemode.  They're currently admin only but I might make them obtainable by xenoarch later.
Adds powertools, also from /tg/.  CE starts with them in a new toolbelt that spawns in their locker, ported from (you guessed it) /tg/.
Changes welder sprites to look nicer, ported yet again from /tg/.  Modified the blue welder slightly so it can be the electric welder sprite.
Adds various sounds from /tg/, for tools and welders.
2017-08-03 04:49:23 -04:00
Kelshark
d6afef56a9 changed player minimum age for some jobs, fixed amara fluff stuff, adding fluff boxes. Sergal speed +++, Blade borg now got mining stuff, all borgs got pounce module. 2017-01-01 17:03:25 -05:00
Yoshax
8be10d96dd Ports Byond 510 preperations from Bay
Updates comment

Updates supply file
2016-03-14 18:21:44 +00:00
PsiOmegaDelta
0ba7643217 Updates files as necessary to adhere to the new standard. 2015-07-27 09:32:51 +02:00
GinjaNinja32
94e19592cf objects/effects, objects/structures 2015-05-30 14:37:40 +01:00
Graham Lloyd
b6f2d39f6b 3d Sound from /tg/ 2014-03-27 14:49:49 -04:00
johnsonmt88@gmail.com
154a7c0f76 The code compiles again but I make no promises about whether or not the piano works.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5425 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-30 17:51:49 +00:00
daniel.cf.hultgren@gmail.com
49d87eed07 Reverted to oldpiano until me or somebody else decides to fix baysongs and whatever bugs there are.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5422 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-30 10:03:38 +00:00
elly1989@rocketmail.com
4d9876fd65 Fixes issues with pen bbcode. Replacetext did not work correctly after I changed text2list - (It was missing 'needles' at the beginning of 'haystacks').
>dd_replacetext and dd_replacetext_case are now replacetext and replacetextEx respectively.
>replacetext and replacetextEx works using strings only; it doesn't convert it into a list and then back into a string.

Fixes some dumb-dumbs in textlist and text2listEx
> "<" where there should be a "<="
> no else case for when the separator is longer than the text (causing empty lists to be returned)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4971 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 21:21:17 +00:00
giacomand@gmail.com
6a2d78bc94 -Killed the updateDialog lag. I added a check to see if there were any mobs to update, if not it will stop checking until a user uses the machine again. I had to replace all the machine = src and machine = null with procs to help make it manageable. I believe this is one of the culprits causing the server to lag as the round goes on, as more players will interact with machines.
-Atmos delay is now based on active players, to help fight lag for massive player rounds.

-Changed some for(blah in world) loops to use the correct lists.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4958 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-25 19:15:51 +00:00
elly1989@rocketmail.com
7b720a20b6 >Moved most of the helper procs into code/__HELPERS. If you see ANYTHING generic enough to be a helper proc just throw it in there and help purge the copypasta 5ever
>Replaced dd_text2list, dd_text2listcase, tg_text2listcase and tg_text2list with text2list and text2listEx. text2list will return a list of each and every character in the string if you set separator=""
>added return_file_text(filepath) which returns text from a file after doing some checks: does the file exist? is the file empty? It prints helpful error messages to the world.log if it runs into problems
>Replaced dd_file2list(filepath, seperator) with file2list(filepath, seperator). It just calls text2list(return_file_text(filepath), seperator). rather than copypasta
>Replaced time_stamp() so it's not as retarded
>Lots of the world setup stuff uses file2list now, rather than file2text -> sanity -> text2list
>Added error() warning() testing() procs. These print messages to world.log with a prefix. e.g. ## ERROR: msg.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4948 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 14:39:36 +00:00
daniel.cf.hultgren@gmail.com
58dfdf5026 uruereruguu
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4776 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-29 23:14:57 +00:00
daniel.cf.hultgren@gmail.com
20edf15eab * You can now properly import baystation and oldpiano to the new piano
* Fixed the BPM +/- signs
* Fixed the violin


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4775 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-29 23:11:19 +00:00
daniel.cf.hultgren@gmail.com
fc4a98ba39 *Reworked Piano, now optimized and whatnot, new interface
*Updated changelog

Please notify me of any bug so it can get fixed.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4757 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-25 18:35:16 +00:00
elly1989@rocketmail.com
bbd020b436 Runtime fixes for:
runtime error: bad icon operation
proc name: New (/icon/New)
  usr: Charles Mycroft (/mob/living/carbon/human)
  src: /icon (/icon)
  call stack:
/icon (/icon): New("plating", "metal1", null, null, null)
the wall (185,137,1) (/turf/simulated/wall): clean blood()
Space cleaner (/datum/reagent/space_cleaner): reaction turf(the wall (185,137,1) (/turf/simulated/wall), 11.6)
/datum/reagents (/datum/reagents): reaction(the wall (185,137,1) (/turf/simulated/wall), 1, 10)

runtime error: list index out of bounds
proc name: Topic (/obj/structure/device/piano/Topic)
  source file: musician.dm,525
  usr: Toto (/mob/living/carbon/human)
  src: the space minimoog (/obj/structure/device/piano)
  call stack:
the space minimoog (/obj/structure/device/piano): Topic("src=\[0x200723e];modifyline=1", /list (/list))
Octisetti (/client): Topic("src=\[0x200723e];modifyline=1", /list (/list), the space minimoog (/obj/structure/device/piano))

Added sanitization to user inputs in piano/Topic()

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4605 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-02 22:32:24 +00:00
johnsonmt88@gmail.com
ecd5a2283d Standardized musician.dm
Also the piano now has a 50/50 chance to spawn as the minimoog or space piano

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4577 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-28 16:21:34 +00:00
johnsonmt88@gmail.com
19135de9eb Changes to the file structure!
There are many files, folders and chunks of code in areas that make absolutely no sense and thanks to the defines being located mostly in a completely separate file, it can be damn-near impossible to find something. Before moving defines to where the rest of their code is located; I'm going to move some code around into places that actually make sense to begin with. I'll mainly be focusing on the code/game/objects folder.

This commit mainly lays the groundwork for the work I'll be doing by adding in the effects, structures, decals and turfs folders. I'll slowly be moving appropriate files and code into these folders. I may end up moving machinery into 'objects' and mech stuff into its own module folder but I'll ask for some opinions on coderbus before doing that.

I've also gotten rid of the /magic/ folder. I've moved the library stuff into its own folder in modules/library, the cult stuff is now in gamemode/cult with the rest of it and musician.dm is now in objects/structures since the piano is a structure apparently.


I think I've got the hang of how DM and SVN handles folders and files but it's quite possible that something will break simply by svn committing it oddly. Please let me know if that's the case!

Remember to clean compile.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4513 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-22 15:50:09 +00:00