Commit Graph

446 Commits

Author SHA1 Message Date
deathride58 2a92653e68 Merge pull request #5867 from Citadel-Station-13/upstream-merge-36290
[MIRROR] [s] Guards client.holder
2018-03-09 18:39:35 +00:00
vuonojenmustaturska f25ed2503e Merge pull request #36290 from tgstation/Cyberboss-patch-5
[s] Guards client.holder
2018-03-09 10:28:17 -06:00
Qustinnus a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00
Poojawa 57bd3824a4 fixes things and mentors. 2018-03-06 23:34:54 -06:00
Poojawa 455ee7e687 modules 2018-03-06 21:45:16 -06:00
Poojawa 86b11050b6 Citadel's folder's end (#5828)
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
2018-03-06 17:40:48 -06:00
Poojawa 6e5131cfc5 Vore code to json and more (#5789)
* Vore 2.0

Initial commit

* double checked porting

* Fixes compile issues

* converts Ash Drake bellies to new system

digs out lingering datum/belly stuff too

* Let's just work on this later

* System operational

* Update preferences.dm
2018-03-06 03:59:31 -06:00
deathride58 b4e01ac82c Fixes widescreen pref regression (#5822) 2018-03-05 16:12:35 -06:00
CitadelStationBot 3569152bf8 [MIRROR] Cleans up save file update code. (#5816)
* Cleans up save file update code.

* fixes merge issue
2018-03-05 14:44:18 -06:00
Cameron! 841a4199af Removes MediHound's Noncon Vore (#5738)
* Removes MediHound's Noncon Vore

MediHound once again respects vore preferences, as intended.

To make up for this, they now receive a unique cyborg hypospray with fewer reagents, increased energy costs, and no ability to upgrade.

* Moves Preference Check to New Sleeper-Specific Variable, Buffs Hypo

Rather than using target.devourable, MediHounds now check for a new target.sleeperable preference, which defaults to TRUE.

Also, removed the custom HoundHypo. MediHounds will now get the full borg hypospray.

* Removes unnecessary 5th port code

* Breaks the patch for Bhijn's viewing pleasure

DNM etc

* Still not fixed

* Fixes it again.

MediHound sleeper preference is now a game preference toggle, rather than a vore panel toggle.

MediHounds will not be able to ingest SSD or catatonic players.
2018-03-05 12:33:23 -06:00
CitadelStationBot d3905c723f [MIRROR] Add support for auto admin when ran in single user mode (#5762)
* Add support for auto admin when ran in single user mode

* Update client_procs.dm

* fixes compile issues, also adds in some legacy mentor code
2018-03-04 13:06:42 -06:00
deathride58 272d0e1caf Update preferences_savefile.dm 2018-03-02 21:30:58 -05:00
deathride58 616269a8f1 Update preferences_savefile.dm 2018-03-02 21:30:14 -05:00
deathride58 797a35e5ad Update preferences_savefile.dm 2018-03-02 21:29:45 -05:00
deathride58 0b4cdc2e69 Update preferences.dm 2018-03-02 21:28:33 -05:00
Ashe Higgs 0a449af83e Adds minor roundstart traits! (ala CDDA, etc.) 2018-03-02 14:38:18 -06:00
Poojawa 8305efd5a1 Vore preference fix + Sounds respect wall barriers (#5623)
* various vore QoLs

* removed unused button, added the verb
2018-02-21 00:42:11 -06:00
AnturK 35b8e410be html_interface removal and crew monitoring console refactor. 2018-02-15 14:31:27 -06:00
deathride58 4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045
TG Sync #4985279348672983476
2018-02-14 04:11:44 +00:00
vuonojenmustaturska 6a094232bc Merge pull request #35642 from MrStonedOne/patch-482
[s]Fixes blacklisted byond builds
2018-02-13 16:48:48 -06:00
deathride58 0a384243f6 work! compile! actually function! 2018-02-12 21:22:09 -05:00
Jordan Brown 59f7343c5e Merge pull request #35603 from MrStonedOne/patch-480
blacklists 512.1408 for basically being a wallhack (again)
2018-02-12 16:23:44 -06:00
Kyle Spier-Swenson affcbcd609 [s]Blacklists the most recent version of byond for basically being a wall hack (#35516)
* Blacklisted client builds.

* Missed a spot

* glob was a mistake
2018-02-11 05:14:04 -06:00
Ashe Higgs dd6a2541f4 Fixes button lock not saving (#35465) 2018-02-10 09:58:11 -06:00
deathride58 d236b75ca0 adds widescreen pref 2018-02-07 01:42:31 -05:00
CitadelStationBot 9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
Poojawa 03b33075e5 Mentor System (#5235)
* reworked mentor system, again. wew

* Update admin.txt

* uhg
2018-02-05 04:09:56 -06:00
CitadelStationBot 330a6ca0af Added transit tubes to the RPD (#5300) 2018-02-05 00:46:34 -06:00
CitadelStationBot 2d9f549af3 [MIRROR] Raises the cid check disconnect time out (#5272)
* raises the cid check disconnect time out (#35244)

Disconnects from deleting the client are immediate, where are other commands are queued to some degree or another, browse is the worst one of all since it has to queue behind after connect resource sends as well as the asset cache or browse_rsc calls.

I'm finding hints that clients on lagger connections are getting disconnected before getting the reconnect command, and I was able to reproduce this myself on a cell phone connection while connecting to terry

* Raises the cid check disconnect time out
2018-02-04 23:05:22 -06:00
CitadelStationBot 1d11603d52 [MIRROR] Fixes a naughty dot (#5237)
* Merge pull request #35150 from DaxDupont/myanusisbleeding

Fixes a naughty dot

* Fixes a naughty dot
2018-02-04 22:11:48 -06:00
deathride58 408e0cce5f Fixes genital previews (#5251) 2018-02-01 12:58:44 -06:00
Poojawa a7f0ffb6f0 modules 2018-01-31 06:56:28 -06: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
LetterJay cd17afba45 Update preferences.dm 2018-01-24 21:44:00 -06:00
Jordan Brown 51e4d9f9db All color inputs use current color as default choice 2018-01-24 18:14:16 -06:00
MrDoomBringer 4d206f56e8 Adds ~70 more suicides 2018-01-23 01:39:07 -06:00
Jordan Brown f3627b8428 Merge pull request #34331 from Shadowlight213/expplayervisibility
Players can now see their own tracked playtime
2018-01-19 08:45:02 -06:00
LetterJay 91299a6152 Merge pull request #4838 from deathride58/loadoutsystem
[READY FOR TESTMERGE] Ports Hippie's loadout system
2018-01-18 15:32:00 -06:00
deathride58 7411b25113 trying to fix the bug that causes gear with apostrophes in their name to be unusable 2018-01-17 18:31:42 -05:00
deathride58 b74518a24a adds more loadout equipment, adds working ckey whitelist system, and more 2018-01-16 16:23:22 -05:00
oranges 2dd1f1f799 Merge pull request #34470 from Cyberboss/MoveMotd
Moves load_motd to config controller
2018-01-16 14:28:07 -06:00
Kyle Spier-Swenson 32adfdae00 Fixes compiler errors in the preload_rsc external resource thingy (#34061)
Fixes compiler errors in the preload_rsc external resource thingy
2018-01-15 09:33:07 -06:00
deathride58 b55a497ffc IT WORKS! its testmergable, just gotta add in a ckey whitelist system and add casual friday, then its good 2018-01-15 01:02:35 -05:00
deathride58 9332db5bb0 Fixes character slot changing runtiming 2018-01-13 23:08:50 -05:00
deathride58 036dc82e12 initial commit - initial pref edits and file copypasting from hippie 2018-01-13 15:45:08 -05:00
Leo 661ac975f1 Merge pull request #34346 from AutomaticFrenzy/patch/slot-machine-icon
Fix slot machine design icon
2018-01-13 05:59:17 -06:00
deathride58 34297d5005 fixes setting flavortext in preferences. hopefully 2018-01-09 23:11:22 -05:00
deathride58 e6ec24d13c Merge branch 'master' into mapsyncs43293845982 2018-01-05 02:03:51 +00:00
deathride58 39016e36b2 fixing compiling errors one at a time 2018-01-04 02:37:02 -05:00
deathride58 61fdecffe5 ohhHH 2018-01-04 02:30:52 -05:00