Commit Graph

398 Commits

Author SHA1 Message Date
Tad Hardesty
6a0ef61b42 Fix manually-given download objective description (#33133) 2017-11-28 03:43:25 -05:00
kevinz000
beb255dbf1 Refactors uplinks to a component 2017-11-20 00:13:26 -08:00
Armhulen
05c41949da adds 1 gbp to armhulen's account (grammar fix) (#32698)
* haha

* okay
2017-11-14 14:02:23 -05:00
AnturK
70d0357b33 Ling datum antag standarization. (#32183)
* Ling datum standarization.

* Removal of redundant file

* Ok
2017-11-05 20:32:37 -05:00
Jordan Brown
f6ce339547 Merge pull request #32185 from AnturK/wiztypo
Fixes TP wizarding.
2017-10-29 11:36:15 -04:00
Emmett Gaines
825ab4def4 [512] The great \ref purge (#31824)
* The great \ref purge

* cleanup
2017-10-28 17:20:04 -04:00
AnturK
0507dd2851 Fixes TP wizarding. 2017-10-28 13:35:03 +02:00
AnturK
825899f9c5 Fixes minor runtime 2017-10-25 23:39:55 -05:00
Jordan Brown
5a4f56bf21 Late join antagonists will try to target late join players (#31560) 2017-10-23 21:07:41 -04:00
AnturK
8a8a247c21 Cleans up datum traitor minimally. (#31978)
* Removes the /custom traitor subtype nonsense.
Fixes borged/ai'zed traitors getting law 0.

* Not needed anymore
2017-10-22 18:44:43 -04:00
AnturK
bfc5a2cca8 Datum rev & related upgrades to base datum antag (#31630)
* Datum rev & related upgrades to base datum antag

* Actually starts objective tracking

* Grammer & clumsy removal things

* unifies file names

* Fixes heads displaying in every mode

* This is why i ask for reviews

* KILL ME

* proper antag detection

* Fixes admin de-revving

* Sanity

* Fix conflicts

* Fixes instant roundend

* Fixes flashes

* Waits until setup is done to declare roundend.
2017-10-18 20:25:42 +13:00
AnturK
e8ff73edef Datum antag wizard. (#31449)
* Wizard datum

* This can go in this one actually

* Old proc

* Delete equipment

* Academy wizard datum

* didn't notice the spawn before

* otufit

* Some special_role removal
2017-10-11 23:23:26 +13:00
Jordan Brown
189ed58a42 Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war
In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 14:27:59 -04:00
AnturK
22e1505d1d Fixes headrev TP (#31462)
* Fixes headrev TP

* Mhm
2017-10-10 14:19:24 -04:00
MrStonedOne
c8bb13d7c2 In which the stoner one gets stoned and tries to address tick contention... again
Tick contention is when the mc, sleep()/spawns(), and byond internal processing fight each other for game tick time. Usually in an unproductive way that wastes cpu cycles and reduces the effective amount of game tick to go around.

Tweaked the anti-tick contention heuristics of the MC a touch.

Fixed an incorrect operator in the mc's anti-tick contention heuristics causing it to apply in times of no lag rather then times of lag.

The mc's anti-tick contention heuristics now plays better with the high pop processing mode.

We no longer reserve the tail end of a tick for the mc to have if the mc doesn't plan to run next tick because of high pop mode or anti-tick contention heuristics.

stoplag() can now be given an initial delay allowing it to act like a smarter sleep (in that it sleeps for longer if the server is overwhelmed.

All short sleeps that only existed for performance reason and had no game play, visual/audio, or balance reasons behind their timing were converted to stoplag().
2017-10-09 01:21:43 -07:00
vuonojenmustaturska
1768ff8b51 Prioritizes the PDA pen as a traitor uplink location when the pen is selected (#31434)
* you too can be a commit

* requested changes
2017-10-08 20:09:40 -04:00
Firecage
ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage
2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
ShizCalev
0ae5cd2d97 Cleans up and fixes old landmarks 2017-10-03 23:38:59 -04:00
oranges
47a74d8cf3 Merge pull request #31135 from KorPhaeron/unconvertable
Adds a var to minds that makes them immune to conversion
2017-10-04 12:14:32 +13:00
AnturK
d293ee7340 Fixes liches losing spells 2017-09-30 14:52:21 -05:00
KorPhaeron
5e5ff73046 Adds a var to minds to make them immune to conversion 2017-09-29 16:59:56 -05:00
Ashe Higgs
b7e7779c19 (Ready) Clockwork Cult Rework: Proof-of-concept (#29741)
* Starting on the rework

* Reworks the Ark

* Work on Reebe

* More Ark stuff

* this too

* Removes ark silliness, remaps Reebe a tad

* Spawning mechanics

* Work on gamemode code

* Finishes up ark stuff

* Removes Judgement, and lots of other changes

* New Ark activation sounds, Ratvar text

* Spawn protection!

* Adds the abscondence bijou

* Bijou stuff

* well, this is it

* somewhat absentminded coder

* Remaps the Reebe z

* replica fabricators now work!

* Guide paper!

* Now they're clockwork floors

* Infirmary, tweaks, numbers

* A new thing!

* this is ok for now

* I was gonna whine but it's actually necessary

* Adds damage scaling to ocular wardens

* I missed a thing

* you can go back too

* New clockwork armor sprites

* Weapons, scripture, oh my!

* no! shoo!

* hey, I forgot about you!

* this looks much better, I'll give you that

* no teleporting into the void!

* we have no need of you anymore

* Conflicteroos

* AUTOMATIC SPINNING CHAIRS

* how many times do we have to teach you this LESSON OLD MAN

* flagged!

* last time, meesa promise

* Conflicts 1

* wood filling

* Kindle is a projectile, and other stuff

* Chameleon jumpsuit, some small changes

* 150 hours of testing

* Curious is the trapmaker's art

* Conflicts 1

* naaah

* Fixes an ark sound

* Removes the prolonging prism

* Adds a delay to warping in

* First steps towards changing the power system

* Removes power from sigils, moves to global

* Conflicts 1

* zoom zoom

* Adds the stargazer, re-adds conversion

* conflicts? more like CLOCK-flicts

* get it? clockflicts?

* Daemon tuning

* Scraps components, 1/?

* A grace period, among other things

* You can't get to reebe from space no stop bad

* Adds some cogscarab shells to Reebe - yes, I get the sounds

* FUCK

* Chairs are very important.

* Clock golems, sound improvement, intercoms

* Sounds, floor fixes, conflicts

* Fixes the conflicts

* Prevents intercom use during non-clock rounds

* Wiki, HUD timer, tweaks, golems

* Components, removes unused structures, rep. fab power

* go-time

* Ending the round is not a good idea

* whoops, forgot about you

* ssh is ok

* this works too
2017-09-27 09:21:26 +13:00
pubby
18f329a3f1 Datum abductors refactor (#30893)
* Datum abductors

* Update UFO crash ruin
2017-09-25 12:00:08 +13:00
Cyberboss
aeafab7caa Merge pull request #30906 2017-09-23 12:11:05 -04:00
AnturK
ce5cf35875 Fixes create antag wizard 2017-09-20 15:06:32 +02:00
ShizCalev
39380d5b03 Removes old debug text 2017-09-19 18:56:39 -04:00
pubby
1e4d1ca42f Traitorbro gamemode (#30344)
A dead-simple traitor variant.

It's like traitor, except instead of an uplink you get a buddy: your blood brother. You must team up with your brother to complete your objectives. It runs along side regular traitor mode, thus the name "traitorbro".
2017-09-18 11:02:23 +12:00
KorPhaeron
10a3238fd6 Makes the station Z level into a list instead of a single define (#30297)
* Makes Station Z Levels a global list

* Things didnt get committed

* Define

* Removes files

* Fix mind.dm

* Wrong list name

* (

* Fixes rev checks and signpost

* Makes it actually compile

* Signpost fix

* I hate these sign posts

* Never use the web editor
2017-09-11 13:39:52 -04:00
Leo
bf6c04526d Uplink lock codes now pick from the phonetic alphabet global list (#30538)
* Uplink lock codes now pick from the phonetic alphabet global list

* Update virus_cart.dm
2017-09-10 21:17:04 +02:00
MoreRobustThanYou
c48def94d8 Removes gangs (#30056) 2017-08-31 17:31:49 -03:00
Jordan Brown
2778209f03 Move along 2017-08-31 15:32:33 -04:00
Xhuis
d25c8228b4 Sanity checkin' 2017-08-30 22:22:45 -04:00
Ashe Higgs
6ba1506472 Revert "Revert "Rearranges the antagonist panel, cleans it up code-wise and appearance-wise (#30255)" (#30289)"
This reverts commit 34b39c6c01.
2017-08-30 15:12:59 -04:00
Jordan Brown
34b39c6c01 Revert "Rearranges the antagonist panel, cleans it up code-wise and appearance-wise (#30255)" (#30289)
This reverts commit 455cf37e52.
2017-08-30 12:17:59 -05:00
Ashe Higgs
455cf37e52 Rearranges the antagonist panel, cleans it up code-wise and appearance-wise (#30255)
* Makes the antag panel look fancier

* Get outta here

* it was either that or spend three hours

* now that's fancy!
2017-08-30 09:01:22 -04:00
Shadowlight213
e458845453 Adds tracking amount of time spent playing departments 2: The fall of the Assistants. (#29105)
* Ports Paradise Job exp system

* changed to use json_decode and json_encode as recommended by oranges

* updates changelog

* Reee cyberboss

* Changes to use a seperate table

* Updates database changelog
Changes to use mediumint

* Back to wip we go.
Changes sql stuff to how mso suggested
Attempts the changes requested in the other pr.

* work on stuff.

* work on stuff.

* Renamed proc for time remaining.
Fixed updating time amounts.
Added delay to fix firing at roundstart

* exp is now stored in a global list, and only updated to the db at round end.

* some stuff

* Added button to toggle exempt status on a player.
Still need to make it update the db

* REEE Jordie.
Undoes delaying exp updating to round end.
Adds the updating filtering to the update_exp_client proc which is used again

* Lowers a bunch of the times needed.

* Makes tracking per job instead of per department.
Department time is now calculated from job time.

* Whoops forgot to update master first. Lemme save this

Reverb should play cheeki breeki to people

* I think I did this right.
Too tired to test atm.
Busy rewatching twintails ni narimasu

* Removes var from proc arguments
Fixes database stuff

* Does some requested changes.
Makes special_role be tracked instead of bundled under special.

* Done, but need to refactor how it handles ghost roles.

* Less false data wew

* Changes

* Updates db version
More changes

* More changes

* More changes

* revision fix

* OOPS

* fix schemas

* Makes SQL error logging handled by Execute
Gang role tracking now strips out the gang name and is generic.
2017-08-20 23:01:08 +12:00
Jordan Brown
a10f2f046b Adds a warning to the traitor panel for the last headrev (#29899)
* Adds a warning to the traitor panel for the last headrev

* Fax

* Fax more
2017-08-19 11:57:15 +12:00
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Jordan Brown
d144c88fb5 Annihilates the colons! (#29812) 2017-08-15 12:49:35 -03:00
Jordan Brown
6175ab77d5 Removes all checks for subsystem existence 2017-08-01 10:16:37 -04:00
ShizCalev
0e9b3967e2 Spellchecks the map definitions (#29485) 2017-07-25 14:16:06 +12:00
ShizCalev
45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
Fox McCloud
2cc3e9c41f Disease Refactor (#29130)
* Vomit Now Contains Viruses

* eh

* typeless memery

* Disease Refactor

* tweaks

* styling

* tweaks

* unecessary comment removal

* whoops

* fix
2017-07-15 11:08:40 -04:00
Really-Good-Soda-Flavor
d23c6f910d Checks for temporary martial arts on mind transfer (#28746)
* Checks for temporary martial arts on mind transfer

* Makes transferring its own proc

* Makes sure martial arts are qdeleted on removal

* Improves teaching and removing
2017-07-04 11:34:05 +02:00
Mike Long
4185f8959f Fixes bugs in devil
Fixes devils not losing souls upon resurrection,.
Fixes spells appearing deactivated upon resurrection.
Fixes unascendable devils being able to get ascension grade spells.
2017-06-26 12:30:59 -04:00
nicbn
77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
Jordan Brown
6aeaf4564a Fixes a documentation typo 2017-06-14 12:41:02 -04:00
kevinz000
703cff4953 Merge branch 'master' into gang_points_refactor 2017-06-06 08:48:51 -07:00
4DPlanner
c7d8e5b5f7 Merge remote-tracking branch 'upstream/master' into datum - I genuinely
have no idea how this was a merge conflict and also fixes paren
2017-06-06 02:49:04 +01:00