Commit Graph

225 Commits

Author SHA1 Message Date
Jordan Brown 1c41c36489 Merge pull request #38672 from AutomaticFrenzy/patch/goonchat-motd
Fix the MOTD having too many newlines
2018-06-25 09:18:27 -05:00
Jordan Brown 684ceb2125 Merge pull request #38553 from AutomaticFrenzy/patch/aghost-saymode
Allow admin ghosts to use .p and .d say prefixes
2018-06-18 13:16:06 -05:00
ShizCalev 18bc48c0df Makes swimsuits underwear (#38372) 2018-06-11 00:14:45 -05:00
oranges de68aa9571 Individual Logs now follow the client around automatically (#37790)
The logging is now stored in the persistent client/player_details datum,
that will survive an entire round

The existing mob log is retained and a new admin verb is added to access
it. It will only show logs for the mob in question, across all players
who possibly spent time in that mob

A new log type is added that tracks the mobs the player changes across
into and the times they occured, to better help admins manage complex
situations, this also appears in the mob log as a record of the players
who entered/exited control of the mob
2018-06-06 04:10:20 -05:00
deathride58 2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
Jordan Brown ec14a7c7ef Merge pull request #37944 from AutomaticFrenzy/patch/irv-jquery
Remove second copy of jQuery used only by IRV polls
2018-05-21 16:33:42 -05:00
LetterJay 0877bdd4e5 Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646
[MIRROR] Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
2018-05-15 00:47:59 -05:00
AnturK 1c164ff28f Fixes possession funtime (#37737)
* Fixes possession funtime

* This should probably be generic backend mob list but i can't think of anything else that would need it.
2018-05-12 19:26:55 -05:00
oranges e0412f6325 Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code 2018-05-06 16:37:13 -05:00
george99g 0a02d1cb13 Deactivate suicide prescans via ghost var 2018-04-29 21:33:56 -05:00
AnturK b8bb30d3de Removes some unused code. (#37449) 2018-04-27 10:33:10 -05:00
deathride58 862898526d Gamemode and gamemode vote obfuscation (Plus hub entry rework) (#6276)
* adds gamemode/gamemode vote obfuscation, redesigns hub entry

* ternaries: the easiest way to obfuscate your code to the point where even you can't read it

* FUCK

* changes the inaccuracy chance from 1/10 to 1/5
2018-04-27 07:40:45 -07:00
Poojawa 0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
kevinz000 38ae8beefc [READY]AI latejoins 2018-04-06 00:44:31 -05:00
kevinz000 6e64e8e601 Failing to latejoin as a job when the latejoin panel is already open now makes a more descriptive error message (#36794)
* job availability

* avail

* Boop
2018-03-31 06:17:20 -05:00
deathride58 0a331a26ee Merge pull request #5994 from Poojawa/beepboop
Adds IPCs refractors preferences
2018-03-21 19:20:43 +00:00
CitadelStationBot 99487a6bbb [MIRROR] April Fools Day replaces the overflow role with Clowns (#6041)
* April Fools Day replaces the overflow role with Clowns (#36533)

* Refactors overflow job assignment

* Fixes job selection

* April Fools Day replaces the overflow role with Clowns
2018-03-21 12:57:30 -05:00
Poojawa 796e22beac LOCAL SUNE PORTS... OH GOD WHAT HAPPENED
That feel when you're in the 'Oh, well while I'm here...' mindset.
2018-03-18 09:02:13 -05:00
Poojawa 6341456b76 elf ear prep, sabresune tweaks. 2018-03-11 08:52:05 -05:00
Poojawa dfbe82a33b added a 'head' snout for Guilmons
and a datashark marking
2018-03-11 08:37:21 -05:00
Poojawa fdeff0ed39 Ckey locks work! HOORAY! 2018-03-11 07:39:38 -05:00
Poojawa 51200f4739 reee 2018-03-11 04:52:07 -05:00
deathride58 1387c8e3b6 Merge pull request #5855 from Citadel-Station-13/upstream-merge-35858
[MIRROR] Mushroom people, revived!
2018-03-09 18:37:29 +00:00
deathride58 78db80026d Merge pull request #5840 from Poojawa/reverts-crybaby-inducer
Reverts crybaby inducer also does the sync things
2018-03-09 18:36:42 +00:00
Armhulen e559fdca2c Mushroom people, revived! 2018-03-07 21:47:42 -06:00
vuonojenmustaturska 5cfc5f3730 Merge pull request #36198 from Cruix/disease_fixes
Disease fixes
2018-03-07 16:04:14 -06:00
Poojawa 455ee7e687 modules 2018-03-06 21:45:16 -06:00
Ashe Higgs 0a449af83e Adds minor roundstart traits! (ala CDDA, etc.) 2018-03-02 14:38:18 -06:00
Poojawa d154a302e1 Sergals don't actually have an extra snout layer 2018-02-18 06:49:30 -06:00
Poojawa d2d1315b13 fixes shepards, adjusts fox markings 2018-02-18 06:41:14 -06:00
Poojawa 3255bfbdbf sergal head stuffs
husky markings too
2018-02-18 04:48:02 -06:00
Poojawa 01bc7310b6 Cryopods from Oracle Station
It's really nice to have a tg based station that's porting good shit.
2018-02-14 14:06:33 -06:00
Michiyamenotehifunana ca8a8e12bf Ports TG nekomimi to Cit's mammal sprite accessories system 2018-02-08 12:59:01 +08:00
Poojawa 03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
Tad Hardesty 4451aca2e8 Refactor weather to use Z traits, assorted related cleanup (#34633)
* Add a proc for getting the station center

* Add a couple of comments to ZTRAIT defines

* Remove unused global_map list

* Refactor weather to use the trait system

* Un-hardcode the transit z-level

* Use Z traits to determine Portal Storm event areas

* Fix loading away missions containing anything that reads traits
2018-01-21 13:34:04 -06:00
Buggy123 57c829a2aa Added observer verb View Gases (#34574)
* Added observer verb View Gases

* Fixed atmospheric report plurality correctness

* Changed mole/s to mol.
2018-01-19 09:23:22 -06:00
oranges 2dd1f1f799 Merge pull request #34470 from Cyberboss/MoveMotd
Moves load_motd to config controller
2018-01-16 14:28:07 -06:00
oranges 3b9b6f156e Merge pull request #33933 from coiax/wizard-late-joining
Late joiners also get summoned guns/magic
2018-01-10 03:11:56 -06:00
deathride58 6957a6f13f Merge branch 'master' into upstream-merge-34105 2018-01-08 20:03:41 +00:00
oranges 1e9598dfbd Clean up a bunch of undefined arg runtimes 2018-01-07 20:53:12 -06:00
deathride58 fd9bc8c35e mob folder - camera to dead 2018-01-04 00:59:07 -05:00
LetterJay 518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783
# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm
2017-12-29 01:34:17 -06:00
oranges 20b8f9c87f Merge pull request #33833 from deathride58/please-repoban-kev
Fixes ghost zoom being broken
2017-12-26 23:50:33 -06:00
LetterJay a7a0823594 Update say.dm 2017-12-25 21:31:50 -06:00
coiax 703667bdff Ghosts can *spin and *flip 2017-12-25 17:11:29 -06:00
deathride58 680e44fb64 Update observer.dm 2017-12-20 22:56:46 -05:00
LetterJay 6c39e94bba Update observer.dm 2017-12-19 17:56:52 -06:00
LetterJay 408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
Emmett Gaines f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00