Commit Graph

6438 Commits

Author SHA1 Message Date
ikarrus 399d2844e5 ENFORCE_HUMAN_AUTHORITY now only applies to Command positions
- Non-humans can join as security again while ENFORCE_HUMAN_AUTHORITY is on
2014-09-07 22:33:56 -06: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
Hornygranny 2fac982191 alien nightvision moved to carbon/alien
random lines fixed
2014-09-07 21:16:32 -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 7750a2baae Merge pull request #4525 from GunHog/HUDS_For_All
Silicon Medical and Security HUDs!
2014-09-07 20:01:12 -05:00
Cheridan 866dbb7959 Merge pull request #4634 from Carn/timSort
TimSort for byond
2014-09-07 19:52:02 -05:00
ikarrus 0e27dc6b39 Resolved Conflicts:
code/modules/mob/living/say.dm
2014-09-07 10:58:13 -06:00
Miauw 877bd04fa1 Makes simple_animals able to emote again??? Fixed #4669 2014-09-07 17:46:02 +02:00
Cheridan 6bde58d70d Merge pull request #4702 from Miauw62/sleepen
Balance changes to the sleepy pen.
2014-09-07 10:38:00 -05:00
Lo6a4evskiy 6af068133a Missed a sodding " 2014-09-07 19:13:58 +04:00
Lo6a4evskiy f62c13bda8 More checks that should have been there in the first place, cleanup. 2014-09-07 18:48:16 +04: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
Alex b7aad470a0 Merge pull request #4705 from Ikarrus/humanmasterrace
Config Option to Bar Lizards from Authority Roles
2014-09-07 15:02:45 +01:00
Miauw 65c963c109 Adds a separate preference for whispers. Fixed #4658 Fixed #4712 2014-09-07 14:29:58 +02:00
Lo6a4evskiy c9824f738b Accidentally revoked some other changes 2014-09-07 16:16:09 +04:00
Lo6a4evskiy c1394ddcbb Integrated some of the security records functionality into security HUD. Couple of bugfixes. 2014-09-07 16:05:06 +04:00
ikarrus 4230894dec Merge branch 'master' of https://github.com/tgstation/-tg-station into hivemindpaygate
Resolved Conflicts:
	code/modules/mob/living/say.dm
2014-09-06 12:59:08 -06:00
Alex 574d5248d4 Merge pull request #4600 from Menshin/2Spooky5Playing
Fixes skeletons unable to play xylophone on their ribcage
2014-09-06 19:13:50 +01:00
Alex c854ef6667 Merge pull request #4703 from Ikarrus/beepboopiamthelaw
Securitrons will only arrest unidentifiable persons when ID check is on
2014-09-06 19:10:07 +01:00
Alex f2fa83c05b Merge pull request #4675 from Aranclanos/ninjamask
Removes ninja mask modes.
2014-09-06 19:07:01 +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
Alex 53e7981a98 Merge pull request #4698 from Ikarrus/roundendreportbugs
Fixes Round-End report bugs
2014-09-06 19:04:27 +01:00
Lo6a4evskiy 82f869c9a6 Updated to resolve conflicts 2014-09-06 13:34:43 +04:00
ikarrus bae6578055 Config Option to Bar Lizards from Authority Roles
aka formalizing Human Supremacy

- Adds a config option ENFORCE_HUMAN_AUTHORITY which prevents lizard players from joining Command and Security roles

[Lizard subjugation intensifies]
2014-09-05 22:44:05 -06:00
ikarrus 4ace65b90e Securitrons will only arrest unidentifiable persons when ID check is on
- Sec bots will check if the person is "Unknown" and without an ID if idcheck is on. This means beepsky will stop targetting people at the HoP line, or officers changing his settings. It's meant to target disguised people, as I had originally intended.
- However, sec bots, unable to identify monkeys, will start arresting them if idcheck is on
- Agent IDs buffed to reduce threat level by 5 instead of 2
2014-09-05 20:40:09 -06:00
Miauw 12d3492426 unticked files are the bane of my existance. 2014-09-05 19:44:41 +02:00
Miauw 7c97447d24 Balance changes to the sleepypen. 2014-09-05 18:24:25 +02:00
Lo6a4evskiy 1139e700a8 Cleanup 2014-09-05 18:32:02 +04:00
Lo6a4evskiy eae6cdbe96 The rest of the junk 2014-09-05 18:14:02 +04:00
Lo6a4evskiy a1fe0c03a2 Merge branch 'master' into Multiple_holograms
Conflicts:
	code/game/machinery/hologram.dm
	code/modules/mob/living/silicon/say.dm
2014-09-05 18:07:35 +04:00
Aranclanos a4446a039b Merge pull request #4626 from Ikarrus/nudeclones
Clones and Podmen will no longer be created with underwear already on
2014-09-05 02:42:43 -03:00
ikarrus c22a44d676 Fixes Round-End report bugs
- Fixes #4664 New Players won't get the "you did not survive" message
- Shift duration minutes will never neve have more than 2 digits (Same thing has been done for the Round Duration timer in Check-Antags Menu)
2014-09-04 21:05:07 -06:00
Aranclanos 28a7ba6a6d Merge pull request #4666 from Miauw62/deafspeakfix
Fixes names of hearing while deaf
2014-09-04 21:13:40 -03:00
quiltyquilty 62d62a28cd fixes what aran told me to fix 2014-09-04 17:36:27 -05: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
quiltyquilty ae7f0cb6fa returns glorious ponytail 2 2014-09-03 19:14:21 -05:00
quiltyquilty 8286e70c20 more epic fixes 2014-09-03 18:53:36 -05:00
Miauw 64c95a2fae Worn ID won't display on station-bounced broadcasts. Fixed #4650 2014-09-03 20:30:40 +02:00
Aranclanos 4ee758c0d8 Removes ninja mask modes (thermal, nightvision, traitor-scan and mason) and gives ninjas night vision glasses. 2014-09-02 21:28:17 -03:00
GunHog b1fefb6bb1 Giacom's suggestions + Borg HUD tweak
- Both HUD procs broken in to several smaller procs.
- Added defines so the arguments to process_data_hud() are clear.
- Several other tweaks to data_huds.dm
- Made the sensor mode defines match the data hud ones.
- Gave borgies a HUD button for sensor modes instead a verb, to be in
line with the AI.
2014-09-02 18:32:06 -05:00
quiltyquilty 4c079bf65b more epic fixing 2014-09-02 17:26:39 -05:00
Miauw ce1637970e Makes hearing deaf people speak not show your name. 2014-09-02 20:35:31 +02:00
Miauw 6ee969ce94 Stops new_players from hearing hivemind chat. Fixed #4643 2014-09-02 20:19:43 +02:00
ikarrus 320693124e Code optimization 2014-09-01 09:01:14 -06: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
ikarrus 53dd04466f Golems created by runes also get the same treatment 2014-08-31 17:51:39 -06:00
ikarrus 350ad32ca0 Changeling Hivemind Communication Costs 1 DNA
- A new Hivemind Communication power is required to be purchased before the changeling can use the changeling channel (:g)
- Changelings without the Communication power can still faintly sense if other changelings are speaking through hivemind.

Remove changeling kill-teams. Add paranoia and ling vs ling conflict.
2014-08-31 13:46:16 -06:00
Cheridan e25affe12e Merge pull request #4337 from Miauw62/say()
[READY] Saycode rewrite
2014-08-31 10:59:04 -05:00
Tokiko1 4ef3beb454 Testing 2014-08-31 14:25:32 +02:00
Tokiko1 ba20a875a0 Should fix merge conflicts 2014-08-31 14:22:56 +02:00