Commit Graph

363 Commits

Author SHA1 Message Date
CitadelStationBot
dff9dabf06 [MIRROR] Fixes stopsounds properly (#5931)
* Fixes stopsounds properly (#36341)

* Revert "Merge pull request #36340 from vuonojenmustaturska/beelogreen"

This reverts commit 259838f38cfda32619e34cf41d57df4d45b75363, reversing
changes made to 111cd316a92f5f5840d96b1fc4bbe4cb7b1ce6fd.

* Fixes stopsounds properly

Also I forgot to actually block admins from bad protocols
it just showed them a message that it was blocked but didn't
block it

* Fixes stopsounds properly
2018-03-13 05:46:27 -05:00
CitadelStationBot
fd42d55993 [MIRROR] Fixes stopsounds (#5912)
* Fixes stopsounds

* Update playsound.dm
2018-03-12 07:58:48 -05:00
CitadelStationBot
c91006c27f [MIRROR] Create ERT refactor (#5924)
* Create ERT refactor (#36321)

cl Naksu
admin: ERT creation has been refactored to allow for easier customization and deployment via templates and settings
/cl

* Create ERT refactor
2018-03-12 07:30:03 -05:00
CitadelStationBot
4f3115cfbe [MIRROR] Play Internet Sound sanity checks (#5918)
* Play Internet Sound sanity checks (#36080)

* Play Internet Sound sanity checks

Now checks if the content URL uses http(s) before playing

* HTML is not HTTP: renames regex

* Converted global regexes to procs that return them

* Revert "Converted global regexes to procs that return them"

This reverts commit 2eedbd6982b0c4de943a72c94f92f9d75001c06e.

* Play Internet Sound sanity checks
2018-03-12 07:04:43 -05:00
deathride58
fdbd8aec97 Merge pull request #5869 from Citadel-Station-13/upstream-merge-36288
[MIRROR] You can no longer SDQL select certain datums
2018-03-09 18:40:09 +00:00
vuonojenmustaturska
bf63e9ad3f Merge pull request #36288 from Cyberboss/BansKevinzFinally
You can no longer SDQL select certain datums
2018-03-09 10:45:58 -06:00
Poojawa
455ee7e687 modules 2018-03-06 21:45:16 -06:00
CitadelStationBot
d95be2e261 [MIRROR] Allows admins to spawn mob-like objects for shenanigans (#5825)
* Allows admins to spawn mob-like objects for shenanigans (#36153)

This is basically extracting the functionality of the animation spell into an admin verb.

Please excuse the browser.dm code, this is more of a stepping stone towards the more complicated popup needed for custom ERTs.

cl Naksu
admin: Admins can now easily spawn mobs that look like objects. Googly eyes optional!
/cl

* Allows admins to spawn mob-like objects for shenanigans
2018-03-06 04:04:12 -06:00
CitadelStationBot
12829e5cad [MIRROR] Little changes and standardisation of some admin commands (#5781)
* Little changes and standardisation of some admin commands

* Update randomverbs.dm

* Update randomverbs.dm

* tab boi
2018-03-04 09:39:41 -06:00
CitadelStationBot
d446d0ed6d [MIRROR] Admin combohud verb (#5785)
* Admin combohud verb (#36096)

* combohuds

* Update randomverbs.dm

* Admin combohud verb
2018-03-04 05:26:22 -06:00
LetterJay
f467484236 Merge pull request #5754 from Citadel-Station-13/upstream-merge-35485
[MIRROR] Antagonist reputation system
2018-03-04 00:31:41 -06:00
Sirenfal
44dc6ac3a0 Antagonist reputation system 2018-03-02 14:38:26 -06:00
Ashe Higgs
0a449af83e Adds minor roundstart traits! (ala CDDA, etc.) 2018-03-02 14:38:18 -06:00
CitadelStationBot
7c036d7ca1 [MIRROR] Select Equipment works on observers (#5554)
* Merge pull request #35728 from coiax/select-equipment-on-ghosts

Select Equipment works on observers

* Select Equipment works on observers
2018-02-17 17:46:36 -06:00
Leo
a5650cccc4 All medal methods are handled on SSmedals as opposed to global procs and also have proper defines, killing with a crusher grants special medals. 2018-02-16 12:18:21 -06:00
AnturK
993f15a415 Converting more auto_custom antagonists. (#35484)
* Thinning out auto_custom uses.

* Not sure what i was thinking.

* Not sure what happened here.

* Fixes

* Forgot i'm doing this so i can remove this

* C

* Valentine antag datums

* This is what i get for adding it manually.
2018-02-16 00:45:20 -06:00
AnturK
4615696173 Highlander antag datum (#35519)
* Highlander antag datum

* Forgot debug line

* Also this
2018-02-11 15:33:02 -06:00
AnturK
f9666ab6c9 Slaughter demon, Morph, ERT / Deathsquad antag datums. 2018-02-05 17:00:09 -06: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
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
Jordan Brown
e84617f17b Datum var cleanup (#34314)
* Consolidates datum var location

* Move ui_screen to /datum/tgui

* Move focusers to datum.dm. Move fingerprintslast to /atom

* Remove focusers list, makes mobs check if their focus is QDELETED in Life()

* Consolidate use_tag and var_edited into datum_flags

* Revert garbage comment

* Thought I already removed this

* Remove the var_edited preservation

* Removes focus QDELETED handling
2018-01-21 21:39:46 -06:00
deathride58
625d46fa19 Merge pull request #4998 from Citadel-Station-13/upstream-merge-34606
[MIRROR] Config dir again except this time it works
2018-01-21 22:41:13 +00:00
Jordan Brown
8dead1da6a Config dir again except this time it works 2018-01-21 12:32:29 -06:00
ShizCalev
68cfdb617b Fixes rev mindswap (#34567) 2018-01-21 12:29:12 -06:00
deathride58
2d3e79ab44 Merge pull request #4952 from Citadel-Station-13/upstream-merge-34574
[MIRROR] Added observer verb View Gases
2018-01-19 19:42:18 +00:00
deathride58
78d31edc6c Merge pull request #4947 from Citadel-Station-13/upstream-merge-34557
[MIRROR] Fixes cancelling equipment selection being equivalent to selecting "Naked"
2018-01-19 19:39:42 +00:00
deathride58
3514629c77 Merge pull request #4931 from Citadel-Station-13/upstream-merge-34331
[MIRROR] Players can now see their own tracked playtime
2018-01-19 19:33:50 +00: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
deathride58
49a5a5cddc Fixes cancelling equipment selection being equivalent to selecting "Naked" (#34557)
* nerfs butterfingers, throws in bonus preorder exclusive cancel button

* Update debug.dm
2018-01-19 09:16:22 -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
AnturK
3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
deathride58
28aae2cf35 Merge pull request #4896 from Citadel-Station-13/upstream-merge-34507
[MIRROR] Add JMP buttons to SDQL select results
2018-01-17 20:13:51 +00:00
deathride58
e14795291d Merge pull request #4889 from Citadel-Station-13/upstream-merge-34319
[MIRROR] Fails travis on common mapping mistakes
2018-01-17 20:12:39 +00:00
Jordan Brown
4f2716f312 Merge pull request #34507 from AutomaticFrenzy/patch/sdql-jmp
Add JMP buttons to SDQL select results
2018-01-16 21:42:12 -06:00
oranges
c9afc3e53d Merge pull request #34319 from ShizCalev/travis-maps
Fails travis on common mapping mistakes
2018-01-16 14:37:26 -06:00
oranges
9dda16954b Merge pull request #34457 from AutomaticFrenzy/patch/air-status
Combine and fix Show Air Status and Air Status in Location
2018-01-16 14:29:29 -06:00
oranges
96f17eebb2 Merge pull request #34155 from deathride58/rudimentaryoutfitequip
Allows admins to select an outfit while transforming a mob to human via rudimentary transform
2018-01-13 04:18:38 -06:00
deathride58
bbc1e0d386 Merge pull request #4787 from Citadel-Station-13/upstream-merge-34305
[MIRROR] Add JMP buttons to mapping debug verbs
2018-01-12 17:47:54 +00:00
deathride58
a7ec44bfcc Merge pull request #4773 from Citadel-Station-13/upstream-merge-34298
[MIRROR] Adds logging and feedback messages to organ manipulations by admins
2018-01-12 17:42:24 +00:00
deathride58
0c56db4f9b Merge pull request #4764 from Citadel-Station-13/upstream-merge-34090
[MIRROR] Replace hardcoded z-level numbers with a trait system
2018-01-12 17:41:28 +00:00
Leo
ab76f05a1e Merge pull request #34305 from AutomaticFrenzy/patch/debug-mapping
Add JMP buttons to mapping debug verbs
2018-01-12 07:04:31 -06:00
kevinz000
5920ec6996 Adds logging and feedback messages to organ manipulations by admins (#34298)
* logging

* Update manipulate_organs.dm
2018-01-11 21:23:21 -06:00
Tad Hardesty
72319a9794 Replace hardcoded z-level numbers with a trait system 2018-01-11 14:06:17 -06:00
Leo
337ed7f0a6 Merge pull request #34189 from ShizCalev/test-area-tick
CHECK_TICK & logging for cmd_admin_areatest
2018-01-11 07:40:41 -06:00
deathride58
ca4c2da248 Merge pull request #4718 from Citadel-Station-13/upstream-merge-34074
[MIRROR] Updates test areas debug command
2018-01-08 20:04:28 +00:00
ShizCalev
f54854bca8 Updates test areas debug command (#34074)
* Sanity check for test areas debug command

* Shifted to popup window
2018-01-08 04:39:09 -06:00
deathride58
3e937fcecf Merges #4679 , #4670 , and #4677 2018-01-07 15:29:42 -05:00
deathride58
0dbc2241ea modules: A to C 2018-01-04 00:46:53 -05:00
LetterJay
3a2deb1d49 Merge branch 'master' into upstream-merge-33601 2018-01-02 18:26:18 -06:00
LetterJay
f2f6d9d910 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829
# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/events/spider_infestation.dm
#	code/modules/events/vent_clog.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
2018-01-02 05:16:13 -06:00