Commit Graph

1038 Commits

Author SHA1 Message Date
paprka
ca9ab8ebd7 updated coding 2014-09-30 16:34:16 -07:00
paprka
6db18cff96 initial commit 2014-09-30 13:41:02 -07: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
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
Remie Richards
1fd6f72f8e Merge pull request #4923 from Menshin/active_diseases_cleaning
active_diseases list cleans up on disease cure
2014-09-23 22:54:57 +01:00
Miauw
206480744a brings emag back down to 6 tc 2014-09-23 20:05:12 +02:00
Cheridan
ff5ec967eb Merge pull request #4917 from Jordie0608/plastiqueisoldfrechforplasticexplosives
Standardizes name and path of plastique/plastic explosive/c4 to C4
2014-09-23 09:02:43 -05:00
Aranclanos
95b9754f01 Merge pull request #4507 from RemieRichards/AntagBeforeJobs
Antag selection before Job selection
2014-09-23 08:13:39 -03:00
Miauw
be939d4bc1 Adds Syndicate surplus crates, containing 50 TC of random items. 2014-09-22 20:16:59 +02:00
Miauw
619b7beede Syndie bundle adjustments. Made the emag one TC more expensive. 2014-09-22 18:37:27 +02:00
ikarrus
eabe1f4491 Resolved conflicts and addressed maintainer feedback. 2014-09-21 15:30:54 -06:00
Menshin
fbfc9c1cbb Makes the global active_diseases list clean up when a disease is cured. 2014-09-21 21:07:45 +02: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
Jordie0608
facb2744cb Standardizes name and path of plastique/plastic explosive/c4 to C4 2014-09-21 17:34:26 +10:00
Cheridan
e044df744d Merge pull request #4862 from phil235/VirusFix
Fix virus detectability for medbot and medical HUD
2014-09-19 14:54:30 -05:00
ikarrus
7c32420497 Resolved conflicts and added my yml changelog file 2014-09-19 09:30:59 -06:00
Cheridan
8bb2180dde Merge pull request #4855 from Aranclanos/seriouslyitwasthisieasy
Supply datums roundstart mass-deletion fix.
2014-09-17 19:03:02 -05:00
Remie Richards
7c96b0aa95 Merge branch 'master' of https://github.com/tgstation/-tg-station into TraitorBeforeJobs
Conflicts:
	code/datums/mind.dm
	code/game/jobs/job_controller.dm
2014-09-17 23:11:39 +01:00
phil235
1b0413fe51 Changing the severity of some diseases. 2014-09-16 19:20:05 +02:00
phil235
a6a3e1c008 * Medbots will stop detecting viruses undetectable to Health Analyzers or Pandemic machines.
* Medbots will stop considering 100% harmless(beneficial or neutral symptoms) viruses as a disease to cure.
* gives a severity to all standard diseases.
* gives a severity var to symptoms.
* Players with only harmless (beneficial or neutral) viruses don't appear as ill on medical HUD.

Fixes the virus issue.
2014-09-16 19:06:11 +02:00
Aranclanos
84bb478764 Supply datums will now use initial() to get the name of the items in their contents, instead of creating and deleting the objects before roundstart. 2014-09-16 03:27:14 -03:00
ikarrus
8f82644d0f All Nuke Ops are told the code when spawned
So they don't have to rely on some sheet of paper.
2014-09-15 09:18:12 -06:00
Alex
538641adb6 Merge pull request #4728 from Perakp/emaggedDoor
Emags don't affect unpowered doors
2014-09-11 19:54:02 +01:00
Cheridan
88471ff0d6 Merge pull request #4622 from Ikarrus/hivemindpaygate
Hivemind Communication (:g) must be purchased before use
2014-09-10 07:09:55 -05:00
ikarrus
f0c2cfee5e Bundled hivemind DNA exchanging 2014-09-09 09:37:28 -06:00
Cheridan
89aebe05b9 Merge pull request #4699 from Ikarrus/sscargo
Adds Space Suit Crate to cargo
2014-09-08 06:58:28 -05: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
Perakp
77ec6cbe29 Emags and ninja blades don't affect unpowered doors.
Combines checks to one hasPower() proc.
2014-09-07 18:34:34 +03: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
Alex
9d2e1ffafd Merge pull request #4630 from Ikarrus/nukeopsetup
Nuke Ops Update
2014-09-06 19:10:38 +01:00
ikarrus
33467c8a06 clarification in comments 2014-09-05 22:58:58 -06: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
Miauw
7c97447d24 Balance changes to the sleepypen. 2014-09-05 18:24:25 +02:00
Ikarrus
84ae64f61c Update supplypacks.dm 2014-09-04 22:59:37 -06:00
ikarrus
a2535e07dc Adds high-end Syndicate crate to cargo
A high-end crate for traitors. Siphon funds to the Syndicate and they will sneak a reward for you with the next shipment.

Gives you a random syndicate bundle for 140 points.
2014-09-04 22:56:29 -06:00
ikarrus
443737d163 Adds Space Suit Crate to cargo.
A single space suit for the cost of 80 points.
Requires EVA access.
2014-09-04 22:29:03 -06:00
Alex
a0bf1cb7f4 Merge pull request #4621 from Ikarrus/bombsto6
Increases Syndicate Bomb cost to 6TC
2014-09-02 16:39:52 +01:00
Cheridan
ed9ef3c3e3 Merge pull request #4583 from JStheguy/master
NT Poster Port
2014-09-01 17:49:44 -05:00
JStheguy
1d21fb5d20 Mail Order Corporate Posters
Whoops forgot about this bit.
2014-09-01 17:44:39 -05: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
3e4378f75f - A leader will always be chosen
- Nuke ops will all stop spawning on the same spawn location (TC management console)
2014-08-31 21:27:32 -06:00
ikarrus
908cac5ac0 Quick-Create Nuke Ops Actually Working
- A nuke will actually spawn with them
- The armory closet (pinpointers, etc) will actually spawn
- Cleaned up code
2014-08-31 19:27:41 -06:00
ikarrus
4cfbbd4cde Increases Syndicate Bomb cost to 6TC
In the interest of cutting down on the same tired pair of telecoms and SMES bombings, I'd like to increase syndicate bomb costs to 6, so they can only buy one.
2014-08-31 12:13:57 -06: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
5aa62a83bb Gang name will be randomized outside of Gang Mode. 2014-08-31 02:55:18 -06:00
ikarrus
f901a0e98a Additional Tweaks 2014-08-31 01:50:16 -06:00