Commit Graph

3165 Commits

Author SHA1 Message Date
Firecage
caa4d60503 Phase Honk 2014-09-15 12:44:52 +02:00
Firecage
16502db223 Merge branch 'master' of https://github.com/tgstation/-tg-station.git into STATUESGALORRE 2014-09-15 11:17:44 +02:00
Firecage
ad5d15a225 New part 2014-09-15 11:16:39 +02:00
Alex
6697b18f7a Merge pull request #4770 from Donkie/glassfix
Fixed welding a shard producing message spam
2014-09-14 13:20:24 +01:00
Alex
37b4c6bdfa Merge pull request #4793 from Aranclanos/falsewalldismantle
Fixes the dismantling falsewalls with plasmacutters, diamond drills and energy blades.
2014-09-14 13:16:16 +01:00
Alex
1b0e83e00a Merge pull request #4786 from Aranclanos/gamemodeunusedvars
Removes two unused vars of the gamemode datums.
2014-09-13 19:55:38 +01:00
Aranclanos
6b574ce07c Fixes the dismantling falsewalls with plasmacutters, diamond drills or energy blades. 2014-09-12 06:44:25 -03:00
Hornygranny
e36189772a fixes resin runtime, weeds and walls update icons properly on destruction 2014-09-11 14:40:35 -07: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
Aranclanos
8348743237 Adds failure message for when you try to rename a endoskeleton with a pen. 2014-09-10 08:09:39 -03:00
Daniel
d29d3a37da Fixed welding shard message spam 2014-09-10 11:55:07 +02:00
Cheridan
12a926ae9e Merge pull request #4532 from hornygranny/smoothaliens
alium update
2014-09-09 14:54:43 -05:00
Hornygranny
5f33e3d713 old alien sprites, description updates 2014-09-09 11:21:41 -07:00
Cheridan
cb834f6f29 Merge pull request #4746 from kyrahabattoir/goodbyeRussian
Because aparently we can't have nice things.
2014-09-09 12:51:20 -05:00
KyrahAbattoir
20d9e6c2b2 Because aparently we can't have nice things. 2014-09-08 17:26:28 +02:00
Hornygranny
02e527e938 Merge branch 'smoothaliens'
Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/modules/mob/living/carbon/alien/alien.dm
2014-09-07 21:33:48 -07:00
Cheridan
cd34be6151 Merge pull request #4521 from Incoming5643/summonevents
Magic Mania $1.75: Summon events
2014-09-07 22:34:26 -05: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
Alex
8f81a0e766 Merge pull request #4709 from Lo6a4evskiy/2014-08-15-Welding-stuff
Removed unnecessary messages when welding
2014-09-07 15:08:01 +01:00
Firecage
b3c842b614 phase 1 part 3: Anonussing 2014-09-07 00:40:48 +02:00
Firecage
ea900fc0e7 Phase 1 part 2: Improvement to code 2014-09-06 22:46:44 +02:00
Firecage
2bf0773261 First phase of statues part 1 2014-09-06 21:14:27 +02:00
Alex
7a9aeaf15f Merge pull request #4711 from Ikarrus/consistentwelds
Consistent welding sounds
2014-09-06 19:08:53 +01:00
Alex
368b8b199b Merge pull request #4682 from Menshin/reagents_consumption_fix
Fixes reagents extra consumption + some cleanup
2014-09-06 19:05:42 +01:00
Alex
62a7596270 Merge pull request #4686 from Miauw62/idfix
Worn ID won't display on station-bounced broadcasts.
2014-09-06 19:04:59 +01:00
ikarrus
93d7aa68c2 Consistent welding sounds
Starting a weld job will always play welder.ogg
Finishing a weld job will always play welder2.ogg

Closets and airlocks were backwards.
2014-09-06 10:06:17 -06:00
Firecage
aab99e8825 Fixes what Miauw said 2014-09-06 15:19:58 +02:00
Lo6a4evskiy
82f869c9a6 Updated to resolve conflicts 2014-09-06 13:34:43 +04:00
Miauw
7c97447d24 Balance changes to the sleepypen. 2014-09-05 18:24:25 +02:00
Firecage
c6a386a13a Conflict fix 2014-09-05 09:51:25 +02:00
Aranclanos
c487dd350a Merge pull request #4620 from Cheridan/how_do_they_fit
stop asking how crowbars fit in your pocket fffff
2014-09-05 02:44:01 -03:00
Miauw
64c95a2fae Worn ID won't display on station-bounced broadcasts. Fixed #4650 2014-09-03 20:30:40 +02:00
Menshin
6c7ff25568 *fixes reagents consuming extra units each ticks (#4608)
*removed the inexistent reagent/plasma subtype of hellwater
*hitting someone with unholy water in body with the bible now turns the unholy water in holy water instead of space cleaner
2014-09-03 09:47:47 +02:00
Hornygranny
c2827a64a0 lowered weeds layer 2014-09-02 10:53:36 -07:00
ikarrus
bf5f5e5922 Resolved Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-09-01 22:58:23 -06:00
Firecage
38beaaf75c Updates 2014-09-02 01:24:54 +02:00
Cheridan
ed9ef3c3e3 Merge pull request #4583 from JStheguy/master
NT Poster Port
2014-09-01 17:49:44 -05:00
Firecage
7eddda88d0 Merge branch 'master' of https://github.com/tgstation/-tg-station.git into mineralfloors 2014-09-01 23:53:41 +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
Cheridan
da5b68e7ee stop asking how crowbars fit in your pocket fffff 2014-08-31 13:02:04 -05:00
Alex
837d5bc7eb Merge pull request #4456 from Ikarrus/table_prints
Fingerprints for Cables and Tables
2014-08-31 17:11:14 +01:00
Cheridan
e25affe12e Merge pull request #4337 from Miauw62/say()
[READY] Saycode rewrite
2014-08-31 10:59:04 -05:00
Firecage
834f9a05b9 Mineral flooring 2014-08-31 17:12:17 +02:00
Miauw
6176d845f0 fixes some stuff gia told me to fix 2014-08-31 14:27:40 +02: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
Alex
c788df4d6e Merge pull request #4596 from Jordie0608/greenisthecolorofdiseaseandirish
[MAP] Fixes #3147 Greens Viro, fixes building glass med airlocks
2014-08-31 12:34:34 +01:00
Alex
ac4b0954f0 Merge pull request #4587 from Firecage/showerloggingprints
Shower logging and prints
2014-08-31 12:32:31 +01:00
Hornygranny
01b01609fe egg click cooldown fixed, HEADCOVERSMOUTH removed from inappropriate items 2014-08-29 16:38:27 -07:00
Hornygranny
2d3756f509 nest pixel_x adjusted 2014-08-29 10:13:37 -07:00