Commit Graph

66 Commits

Author SHA1 Message Date
LetterJay
a3eec6c8f9 Merge pull request #670 from Citadel-Station-13/upstream-merge-26713
[MIRROR] [s] SDQL security patches
2017-05-01 08:11:36 -05:00
LetterJay
31ea9cb309 Merge pull request #657 from Citadel-Station-13/upstream-merge-26689
[MIRROR] [s] Patches SDQL exploits that can return world reference
2017-05-01 08:11:22 -05:00
LetterJay
dd904e3640 Merge pull request #663 from Citadel-Station-13/upstream-merge-26736
[MIRROR] >You have to advanced proccall your client to see who griefed with kudzu (Fixes botany investigate logs being inaccessible with normal means.)
2017-05-01 08:02:44 -05:00
LetterJay
d46b85e9ed Merge pull request #653 from Citadel-Station-13/upstream-merge-26676
[MIRROR] Fix SDQL vars again
2017-05-01 07:59:42 -05:00
CitadelStationBot
fbe0803699 [s] SDQL security patches 2017-04-30 11:30:44 -05:00
CitadelStationBot
3799c28620 >You have to advanced proccall your client to see who griefed with kudzu (Fixes botany investigate logs being inaccessible with normal means.) 2017-04-30 10:24:27 -05:00
CitadelStationBot
9ef9161537 [s] Patches SDQL exploits that can return world reference 2017-04-29 16:59:08 -05:00
CitadelStationBot
c6544f20fd Fix SDQL vars again 2017-04-29 16:36:36 -05:00
CitadelStationBot
29fd2c6de6 Option for admins to show a song's title 2017-04-28 21:02:52 -05:00
LetterJay
a39b40d879 Merge pull request #578 from Citadel-Station-13/upstream-merge-25981
[MIRROR] Initialize Refactor
2017-04-28 09:29:00 -05:00
LetterJay
085b421348 rej fixes 2017-04-28 09:03:56 -05:00
LetterJay
f7fa4d9843 Merge pull request #615 from Citadel-Station-13/upstream-merge-26187
[MIRROR] Adds a delete verb to the vv_drop_down
2017-04-28 08:18:07 -05:00
CitadelStationBot
6e874d1089 Fixes ircadminwho making the wrong list check 2017-04-27 17:56:36 -05:00
CitadelStationBot
df4f3aaaad Adds a delete verb to the vv_drop_down 2017-04-27 17:10:44 -05:00
CitadelStationBot
d77a2bf87d Fixes SDQL global procs 2017-04-27 09:13:33 -05:00
CitadelStationBot
cea81a3357 Initialize Refactor 2017-04-26 16:03:17 -05:00
CitadelStationBot
a905c15dad Replaces /image with /mutable_appearance (#556)
* Replaces /image with /mutable_appearance, where appropriate

* Update miscellaneous.dm

* Delete miscellaneous.dm.rej

* Delete pet.dm.rej

* Update pet.dm

* Update species.dm

* Update miscellaneous.dm

* Update species.dm

* Update miscellaneous.dm

* Delete species.dm.rej

* Update species.dm

pretty sure I got all the indentation correct THIS time, ffs

* Update species.dm

* Update species.dm

fucking tabs man, fucking tabs.
2017-04-26 08:18:35 -05:00
LetterJay
6dc70fc02f Merge pull request #526 from Citadel-Station-13/upstream-merge-26289
[MIRROR] Changed alternate appearances to  /datum/atom_hud s
2017-04-25 21:39:14 -05:00
CitadelStationBot
607868a5de [s]Exploit whack-a-mole 2017-04-25 01:31:50 -05:00
LetterJay
e27c5c8db3 Merge pull request #545 from Citadel-Station-13/upstream-merge-26397
[MIRROR] Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker
2017-04-25 01:02:38 -05:00
LetterJay
6070000c9a Merge pull request #537 from Citadel-Station-13/upstream-merge-26485
[MIRROR] Renames "Hard Reset" to "Reboot World"
2017-04-24 21:23:31 -05:00
LetterJay
8c56134f56 Merge pull request #478 from Citadel-Station-13/upstream-merge-26341
[MIRROR] Adds a link to individual logs on the player panel and moves the other one
2017-04-24 19:57:08 -05:00
CitadelStationBot
4baa357739 Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker 2017-04-24 18:07:12 -05:00
CitadelStationBot
9868ae6036 Renames "Hard Reset" to "Reboot World" 2017-04-24 14:24:27 -05:00
CitadelStationBot
4025652c11 Fixes Advanced Proc Call 2017-04-24 10:05:15 -05:00
CitadelStationBot
387caa518f Changed alternate appearances to /datum/atom_hud s 2017-04-23 13:26:08 -05:00
CitadelStationBot
7dc86aa2db Fix current_ticket.initiator not being set when a client relogs (#520) 2017-04-23 01:36:14 -05:00
CitadelStationBot
a50d9e9860 Secrets panel logging is better 2017-04-22 07:08:28 -05:00
Poojawa
f866139c52 Admin ticket tgstyle (#493)
* some porting

* other changes
2017-04-20 22:00:47 -05:00
LetterJay
de2d0985c4 Merge pull request #440 from Citadel-Station-13/upstream-merge-26134
[MIRROR] Refactors dbcon into a subsystem
2017-04-19 20:46:02 -05:00
CitadelStationBot
77df269541 Removes a colon 2017-04-19 09:30:58 -05:00
CitadelStationBot
1993b8a48e Adds a link to individual logs on the player panel and moves the other one 2017-04-19 06:04:32 -05:00
CitadelStationBot
278cbbaf35 Refactors dbcon into a subsystem 2017-04-17 09:46:09 -05:00
TalkingCactus
abd7f2b348 Cleans Up Rejected Mirror files (#414)
* bang

* updates tgstation.dme

* fixes missing stylesheet entries

* updates the map

includes backup map file

* removes ten billion runtimes
2017-04-15 17:55:53 -04:00
CitadelStationBot
fe57757fd7 Adds a proc to check if the current thread is from an admin advanced proc call (#400) 2017-04-15 14:41:36 -04:00
Poojawa
9e72b1b8fd /tg/ 4/14 (#367)
* outside code stuff

* defines, helpers, etc

* everything not module

* modules

* compiled fixes + missing sounds
2017-04-14 23:28:04 -05:00
Poojawa
7e9b96a00f April sync (#360)
* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
2017-04-13 23:37:00 -05:00
TalkingCactus
89a99d78d1 Adminhelp prompts will now be larger to allow you to proofread large responses and PMs (#345)
* bigger box

* even bigger

well not really, but it's better anyway

* fuck i didn't tick these

* bigger /me input

double emote size as well, stop complaining about cutoffs and don't make
me regret this

* cleanup
2017-04-09 05:53:44 -04:00
LetterJay
78616ca6a9 *reverts back to the separated who list
*fixes a lot of mentor related issue (both them not loading and missing verbs)
2017-03-26 10:44:42 -05:00
TalkingCactus
c997ebcabd Removes Lag (tm) (#313)
* sensible fixes

* this too

* some more

* fixes chair icons

reverted to state before tg pull

* fixes telecomms icons

revert to state before tg pull

* fixes research icons

reverted to before tg pull

* de-whitewashed the stools

* fixed missing broadcaster sprites

* always load from the savefile

helps custom servers who don't want to fuck with the config, this will
never not be wanted with the system we have

* stop it, ghosts

* fixes limb augmentation

https://github.com/tgstation/tgstation/pull/25446

* removes lag

* re-adds sounds

* exception

* makes travis happy
2017-03-26 09:39:29 -04:00
Poojawa
a8d181c00c Update admin_verbs.dm (#314)
Enables moderator staff to issue controller restarts
2017-03-25 14:52:44 -05:00
Poojawa
f67e9f6d87 Bleeding edgy refresh (#303)
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
2017-03-21 11:44:10 -05:00
TalkingCactus
97327d2beb Hotfixes for March 3, 2017 (#260)
* fixes sterile mask box

* fixes admin map templates

https://github.com/tgstation/tgstation/pull/24581

* syndicate beacon refactor

https://github.com/tgstation/tgstation/pull/24612

* singularity tracking

https://github.com/tgstation/tgstation/pull/24609

* puddle description

https://github.com/tgstation/tgstation/pull/24601

* aux base landing fix

https://github.com/tgstation/tgstation/pull/24594

* comms console cooldown

https://github.com/tgstation/tgstation/pull/24579

* cult fixes + pronouns

https://github.com/tgstation/tgstation/pull/24590

* minebots now check for pressure

https://github.com/tgstation/tgstation/pull/24604

* fixes a very annoying spawn

https://github.com/tgstation/tgstation/pull/24588

* fixes false positive AI cheat check

https://github.com/tgstation/tgstation/pull/24558
mso is bae

* Fixes abductor surgery designs

https://github.com/tgstation/tgstation/pull/24593

* Allows transit space shuttle repairs

https://github.com/tgstation/tgstation/pull/24582

* fixes indentation error
2017-03-03 15:15:42 -05:00
Poojawa
768c644638 Reverts admin ticket system (#256)
* Reverts admin ticket system

Way too buggy right now.

* I guess dme is a thing
2017-02-28 23:10:37 -06:00
LetterJay
cf680a63d2 changes most, if not all, the send2irc_adminless_only to send2irc 2017-02-28 21:40:52 -06:00
Poojawa
0bca862419 Overhauls and 2/28 sync (#244)
* map tweaks/shuttle engines

* helpers and defines

* global/onclick

* controllers and datums

* mapping

* game folder

* some other stuff

* some modules

* modules that aren't mobs

* some mob stuff

* new player stuff

* mob living

* silicon stuff

* simple animal things

* carbon/ayylmao

* update_icons

* carbon/human

* sounds and tools

* icons and stuff

* hippie grinder changes + tgui

* kitchen.dmi

* compile issues fixed

* mapfix

* Mapfixes 2.0

* mapedit2.0

* mapmerger pls

* Revert "mapedit2.0"

This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481.

* clean up vore folder + 2 hotfixes

* admin ticket refinement

* Blob tweaks and LAZYADD

* LAZYADD IS LAZY

* Magic strings purged

* DEFINES NEED HIGHER PRIORITIES

* Only a sleepless idiot deals in absolute TRUE|FALSE

* u h g

* progress bar fix

* reverts ticket logs

* there's always that one guy

* fixes and stuff

* 2/27 fixes

* game folder stuff

* stats

* some modules again

* clothing stuff

gets vg clothing out of the main files

* everything not mobs again

* mob stuff

* maps, tgui, sql stuff

* icons

* additional fixes and compile errors

* don't need this anymore

* Oh right this isn't needed anymore

* maint bar re-added

* that doesn't need to be here

* stupid events

* wtfeven

* probably makes Travis happy

* don't care to fix the grinder atm

* fixes vending sprites, changes turret

* lethal, not lethals

* overylays are finicky creatures

* lazy fix for bleeding edgy (#252)

* map tweaks/shuttle engines

* helpers and defines

* global/onclick

* controllers and datums

* mapping

* game folder

* some other stuff

* some modules

* modules that aren't mobs

* some mob stuff

* new player stuff

* mob living

* silicon stuff

* simple animal things

* carbon/ayylmao

* update_icons

* carbon/human

* sounds and tools

* icons and stuff

* hippie grinder changes + tgui

* kitchen.dmi

* compile issues fixed

* mapfix

* Mapfixes 2.0

* mapedit2.0

* mapmerger pls

* Revert "mapedit2.0"

This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481.

* clean up vore folder + 2 hotfixes

* admin ticket refinement

* Blob tweaks and LAZYADD

* LAZYADD IS LAZY

* Magic strings purged

* DEFINES NEED HIGHER PRIORITIES

* Only a sleepless idiot deals in absolute TRUE|FALSE

* u h g

* progress bar fix

* reverts ticket logs

* there's always that one guy

* fixes and stuff

* 2/27 fixes

* game folder stuff

* stats

* some modules again

* clothing stuff

gets vg clothing out of the main files

* everything not mobs again

* mob stuff

* maps, tgui, sql stuff

* icons

* additional fixes and compile errors

* don't need this anymore

* Oh right this isn't needed anymore

* maint bar re-added

* that doesn't need to be here

* stupid events

* wtfeven

* probably makes Travis happy

* don't care to fix the grinder atm

* fixes vending sprites, changes turret

* lethal, not lethals

* overylays are finicky creatures
2017-02-28 09:30:49 -06:00
LetterJay
640954498f move everything back to irc 2017-02-26 13:29:18 -06:00
TalkingCactus
36c580c236 The Update (#241)
* auto vote runtime error fix

* part 1

* adds a wolf pai sprite

modified fox sprite that doesn't make your eyes bleed

* missed a painful sprite

* part 2

* ptwhatever

* save

* conflict resolution pt1

* conflict resolution pt2

* almost done with the preferences shit

* fixes missing arousal HUD

* file rename

* even more

* keep the panic commits coming

* forgot one

* wew, gonna go make some small changes

* s o o n

* LOOC admin and player toggles

* fixed backpacks and taurs clipping on the preview

* fixed penis length saving

* typo fix

* arousal fix

* icon tuning

* final
2017-02-24 21:42:15 -05:00
Poojawa
fc2dbcd9fe Tg port 2 15 (#230)
* defines/helpers

* globalvars, onclick, controllers

* datums and game

* woooooooooorld. Uh. dm

* modules sans mobs client admin

* modules/admin

* pref shit

* modules/mob

* icon updates

* extra things

* Cherrypicked fixes from open PRs

* metastation.tgm fix

* a better meta fix

* reverts async breakings
2017-02-15 03:35:32 -06:00
Poojawa
e7e9f69ac6 how am formatting?? (#223)
* AAAAAAAAAAAAAAAAAAAAA

* Formatting is dumb

* Update adminhelp.dm

* I'm going to port yog's tickets I think

* wew lads, doubling has been fixed.

* also some quick fixes from TG
2017-02-12 22:40:18 -06:00