Commit Graph

394 Commits

Author SHA1 Message Date
Cheridan fa751f2f72 Merge pull request #4975 from phil235/CloneMessages
Replacing clone damage descriptions with "cellular damage".
2014-09-30 12:21:42 -05:00
Remie Richards 219864312a Merge pull request #4988 from Miauw62/420
Fixes a bunch of saycode things.
2014-09-30 10:23:23 +01:00
Cheridan 7e8e728d85 Merge pull request #4986 from Ikarrus/gangfixes
Gang Mode fixes and improvements
2014-09-29 10:33:17 -05:00
Cheridan 0f5fd59c0c Merge pull request #4919 from Miauw62/tatorbalance
Rebalances traitor items.
2014-09-27 17:13:50 -05:00
Miauw f0ddaf7d8e Merge branch 'master' of https://github.com/tgstation/-tg-station into 420
Conflicts:
	code/modules/admin/admin_verbs.dm
2014-09-27 16:09:31 +02:00
Miauw 77584d4a7d Fixes a bunch of saycode things. Objs can now hear radio talk.
Added a proper strip_html() function.
Fixed #4959
2014-09-27 16:06:06 +02:00
ikarrus 131b5ee0ec - Removes the useless has_been_rev var
- Reworded intercept report to discourage security from inadvertently causing a gang to win.
- Recaller use is logged
- Made the text explaining membership visibility more visible
2014-09-26 21:37:07 -06:00
ikarrus 65e38bdfbc Gang Mode fixes and improvements
The first of many. Most caused by horrible merge-related accidents.
- Gang converts are no longer revolutionaries
- Revolution controls show up in the TP again
- Gang added to game_options.txt defaulting to 0
- Clarified some help text strings
2014-09-26 19:27:13 -06:00
phil235 1d9834b159 Adding changelog and correcting a typo 2014-09-25 20:06:01 +02:00
phil235 b00b41bbf9 Replacing clone damage descriptions by "cellular damage". 2014-09-25 19:11:31 +02:00
phil235 3248e23887 Merge branch 'master' of https://github.com/tgstation/-tg-station into AudibleMsgFix
Conflicts:
	code/modules/recycling/disposal.dm
2014-09-25 18:45:53 +02:00
Cheridan 013a1b1a3f Merge pull request #4918 from Aranclanos/eletropack
Adds the eletropack to the radio controller objects, so they work again.
2014-09-25 08:52:00 -05:00
Swag McYolosteinen 9fc6fccf17 Merge pull request #4616 from Ikarrus/revvsrev
Gang Mode for TG
2014-09-22 20:28:47 +02:00
ikarrus eabe1f4491 Resolved conflicts and addressed maintainer feedback. 2014-09-21 15:30:54 -06:00
Miauw 899d967953 Doubles the amount of TC and the prices of uplink items.
Stealthy items have been slightly decreased in price.
Weapons have been slightly increased in price.
Nuke items remain mostly unchanged.
2014-09-21 15:56:24 +02:00
Aranclanos d156f4770a Adds the eletropack to the radio controller objects, so they work again. 2014-09-21 05:16:02 -03:00
Miauw e66f74439a Fixes radio MMIs turning exofabs into radios.
Also removed the obsolete GLOBAL_RADIO_TYPE variable.
2014-09-20 15:19:29 +02:00
Aranclanos fb15795f2b Revert "Players Jobbanned from Antagonist Roles cannot be spawned as, or converted to, them" 2014-09-19 13:38:10 -03:00
ikarrus 7c32420497 Resolved conflicts and added my yml changelog file 2014-09-19 09:30:59 -06:00
Remie Richards 49bf678e7f Merge pull request #4440 from Ikarrus/antagjobbans_actually_worth_a_damn
Players Jobbanned from Antagonist Roles cannot be spawned as, or converted to, them
2014-09-19 16:00:29 +01:00
Cheridan 7a32582db9 Merge pull request #4745 from Perakp/miningScanner
Mining scanner scans automatically, similar to t-ray scanner.
2014-09-19 09:43:32 -05:00
Cheridan f5bf1ddaa9 Merge pull request #4809 from RemieRichards/Drones
Ports Drones from NTstation + New Improvements/Features
2014-09-17 16:56:40 -05:00
phil235 87d7c9e91e Create the audible_message() proc to replace most instance of " for(var/mob/M in hearers(...) show_message(..., 2)"
fixing typos and missing emotes in emote lists.
2014-09-14 01:15:15 +02:00
Remie Richards 473bcd1858 Ports Drones from NTstation + New Improvements/Features 2014-09-13 15:02:57 +01:00
Aranclanos bfd9ce393e Removes two unused vars of the gamemode datums, uplink_welcome and uplink_uses.
uplink_welcome was actually used as a greeting text from uplinks, now they'll always show "Syndicate Uplink Console:". The removed strings weren't nothing important, actually, with the addition of the uplinks in cargo, you were able to metagame the ongoing gamemode.
2014-09-11 06:06:59 -03:00
Perakp 3a3f703ed9 Mining scanner scans automatically, similar to t-ray scanner.
Cooldown increased for balance/ to not have the flashing ores be too annoying.
2014-09-08 15:00:37 +03:00
Cheridan 866dbb7959 Merge pull request #4634 from Carn/timSort
TimSort for byond
2014-09-07 19:52:02 -05:00
Cheridan 6bde58d70d Merge pull request #4702 from Miauw62/sleepen
Balance changes to the sleepy pen.
2014-09-07 10:38:00 -05:00
Miauw 7c97447d24 Balance changes to the sleepypen. 2014-09-05 18:24:25 +02:00
ikarrus dbf7392649 Every time we would have pulled a random ghost into a mob, we will poll the ghosts for volunteers first. 2014-09-03 23:36:23 -06:00
Miauw 64c95a2fae Worn ID won't display on station-bounced broadcasts. Fixed #4650 2014-09-03 20:30:40 +02:00
carnie 05b76b123e TimSort for byond:
RESULTS:
sorting 10 random lists of length 3 to 303 in increments of 3
(Meh, I forgot to refresh this one, there were only 338 trials rather than 1010, can't be bothered to recode the test)
                                    Profile results (total time)
Proc Name                                             Self CPU    Total CPU    Real Time        Calls
-------------------------------------------------    ---------    ---------    ---------    ---------
/proc/sortList                                           0.672       16.141       16.243       171226  <--TG's current mergesort(recursive, hence the higher number of calls)
/proc/sortTim                                            0.008        3.278        3.274          338  <--TimSort
/proc/sortMerge                                          0.011        2.839        2.855          338  <--new mergesort
/proc/sortInsert                                         0.010        2.124        2.103          338  <--binary insertion

Sorting 10 presorted lists with 3 inversions (3 elements shuffled up), Lists of length 3 to 303 (increments of 3)
                                    Profile results (total time)
Proc Name                                             Self CPU    Total CPU    Real Time        Calls
-------------------------------------------------    ---------    ---------    ---------    ---------
/proc/sortList                                           1.290       23.056       23.254       308050	<--rather cataclysmic
/proc/sortMerge                                          0.015        4.077        4.068         1010	<--
/proc/sortInsert                                         2.639        3.472        3.464         1010	<--
/proc/sortTim                                            0.014        1.567        1.576         1010	<--TimSort is faaar more effective in these cases,
Timsort can exploit runs effectively

sorting 10 presorted lists which have been reversed
                                    Profile results (total time)
Proc Name                                             Self CPU    Total CPU    Real Time        Calls
-------------------------------------------------    ---------    ---------    ---------    ---------
/proc/sortList                                           1.234       23.193       23.295       308050
/proc/sortMerge                                          0.023        4.681        4.686         1010
/proc/sortInsert                                         2.875        3.750        3.765         1010
/proc/sortTim                                            0.020        3.294        3.284         1010	//This can be lower by using a different comparison method
 *Corrected: /proc/sortTim                                0.017        0.665        0.663         1010	//Using a non-strictly ascending comparison

sorting 10 presorted lists
                                    Profile results (total time)
Proc Name                                             Self CPU    Total CPU    Real Time        Calls
-------------------------------------------------    ---------    ---------    ---------    ---------
/proc/sortList                                           1.199       21.391       21.517       308050
/proc/sortMerge                                          0.018        3.724        3.729         1010
/proc/sortInsert                                         2.497        3.302        3.309         1010
/proc/sortTim                                            0.024        0.586        0.584         1010

Summary, all the new procs are faster than the old ones. TimSort is ever so slightly slower than Insertion and Merging on random lists. But on lists with natural runs (partially sorted data) it is far faster than all others.

The old merge sort was removed and replaced with timSort. Other algorithms are provided as alternatives.

All algorithms use a central datum, so accept many of the same parameters. For instance, setting associative=1 will make them sort associative lists by their associated values, rather than keys.
They also accept a cmp argument. This allows sorting of lists of datums, text, numbers or whatever. The pre-existing helpers in lists.dm were rewritten as examples.
2014-09-01 11:29:49 +01:00
Miauw 78a9b0be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into say()
Conflicts:
	code/__HELPERS/game.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/requests_console.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/objects/items/devices/PDA/radio.dm
	code/game/objects/items/devices/aicard.dm
	code/modules/admin/admin_verbs.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/voice.dm
	code/modules/mob/living/carbon/brain/brain.dm
	code/modules/mob/living/carbon/human/whisper.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/say.dm
2014-08-31 13:40:16 +02:00
ikarrus f901a0e98a Additional Tweaks 2014-08-31 01:50:16 -06:00
ikarrus 51a333ebe7 Merge gang mode into latest version 2014-08-30 23:31:44 -06:00
ikarrus 4c801434a8 Gang Mode 2014-08-30 23:17:14 -06:00
ikarrus e1c2f08ce0 Resolve conflicts:
code/game/gamemodes/cult/runes.dm
2014-08-28 20:22:44 -06:00
Miauw bc2b8d0d5d DONE DONE DONE DONE DONE DONE 2014-08-27 17:40:26 +02:00
Firecage 6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
Miauw e3c0b2fa43 AHAHAHAHAHAHHAHAHAHAHASDHHADFHEUAHGUIHGDGIJDOINGEIOKILLTHEMALL 2014-08-24 20:35:49 +02:00
Miauw f704c320d7 More saycode bugfixing, adds a saycode readme, etc. 2014-08-23 16:21:02 +02:00
Firecage 9df78f3681 This fixes the chameleon projector. 2014-08-21 17:02:13 +02:00
ikarrus ed8f928778 -Removed cultist recompense from attempting to convert a jobbanned player
-Jobbanned players will now get replaced by a ghost that is not AFK, has it toggled on in preferences, and is not jobbanned itself
-Procs that have to do with spawning an antag will now check if the candidate is jobbanned before picking them
2014-08-19 20:57:20 -06:00
Ikarrus f39b26000e Update flash.dm 2014-08-18 22:16:52 -06:00
Miauw 5765a2e2cb Resolves many, more saycode bugs. AI tracking is still broken. 2014-08-18 18:51:07 +02:00
Miauw 433262e5e0 Removes debug messages. 2014-08-17 12:58:03 +02:00
Miauw 1fef6effc3 RADIO CODE WORKS NOW HOLY SHIT
(warning, contains tons of debug messages that still need removal)
2014-08-16 20:33:50 +02:00
ikarrus 1cf1a193ca Players Jobbanned from Antagonist Roles cannot be spawned as, or converted to, them
They are instead force ghosted, so it's not taken as free immunity from conversion.
2014-08-14 21:49:19 -06:00
Alex 53d9aca271 Merge pull request #4371 from paprka/bowmanheadsets
Bowman radio headsets
2014-08-11 14:13:26 +01:00
Miauw fa4d21980a Makes the new code test-ready. 2014-08-08 18:19:11 +02:00