shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,082 Commits 5 Branches 0 Tags
828b6315703100e6b9de3d0d4bcd5ce77523e196
Commit Graph

434 Commits

Author SHA1 Message Date
deathride58 5f81f249ca Merge pull request #7560 from izzyinbox/big-admin-pms 
Changes admin-pm input type from single-line text to multi-line message
 2018-09-26 15:23:36 -04:00
Poojawa d231018a3a Flashy flash and Gondola Pods 
and cult effect addition, fixes CTF
 2018-09-21 02:48:17 -05:00
Poojawa cb342866d6 a few last minute changes from TG 
also changes His Grace from 25 to 10 requirments
 2018-09-18 23:12:29 -05:00
Poojawa 42db44b39e Alien Ruin fix, various cherrypicked upstream fixes 
Also adds new buildmode
 2018-09-13 22:55:11 -05:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
izzyinbox 45cb83d6b4 i forgot the most important text -> message conversion 2018-09-11 01:25:45 -05:00
izzy 30133827cf changes adminpm input type from text to message 2018-09-09 00:24:28 -05:00
Poojawa 6344de3a14 Updates IC issue message 2018-08-28 22:50:34 -05:00
LetterJay 1b11773cd9 DB port 2018-08-23 07:20:49 -05:00
deathride58 e402b4c735 Adds emoji support to deadchat and asay. (#7478) 
* Adds emoji support to deadchat and asay

* moves dchat emoji parse to say_dead to make sure sanitization doesnt fuck it
 2018-08-23 00:30:59 -07:00
kevinz000 4ff02b5a8b Sliding Puzzle 2018-08-07 04:44:12 -07:00
kevinz000 2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58 3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58 ac6fddcfb3 Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync 2018-07-05 00:17:44 -04:00
CitadelStationBot 7f0c82b0ba [MIRROR] SDQL where filter message is now correct (#7309) 
* Merge pull request #38853 from optimumtact/seequeuedeeall

SDQL where filter message is now correct

* SDQL where filter message is now correct
 2018-07-03 09:14:00 -07:00
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
LetterJay acd10b02cf Merge pull request #7195 from Citadel-Station-13/upstream-merge-38574 
[MIRROR] Global component signals
 2018-06-24 18:20:17 -05:00
Jordan Brown 4e89973d0b Merge pull request #38637 from DaxDupont/create-antag 
Makes create antags check for on station.
 2018-06-21 18:19:13 -05:00
Jordan Brown c11557d23d Global component signals 2018-06-19 17:18:34 -05:00
Jordan Brown cf96c7dd11 Dsay now shows admin rank instead of ADMIN (#38555) 
* Dsay now shows admin rank instead of ADMIN

* All caps to protect the dongs of our admemes
 2018-06-18 19:17:55 -05:00
CitadelStationBot 03a22ca16d [MIRROR] Transit space refactor (#7130) 
* Transit space refactor

* Update bitfields.dm
 2018-06-18 11:51:02 -07:00
LetterJay 98f6e8def0 Update randomverbs.dm 2018-06-16 16:47:19 -05:00
Jordan Brown b4edde2c0a Add syndicate headset messages, squashes both together. 2018-06-16 06:19:29 -05:00
oranges 1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-11 22:29:27 -05:00
deathride58 e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128 
[MIRROR] Standardizes and cleans up some admin messages & logging
 2018-06-09 05:53:25 +00: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
MrDoomBringer 71f684e5d8 Admin Supplypod tweaks (Behaves like fireballs, also stuns targets) (#38290) 
* Arianya

* whups caps
 2018-06-05 18:02:36 -05:00
MrDoomBringer 678e429dbf Adds a Supplypod-delivery admin smite (#38069) 
* wa la

* oop forgot an icon

* buildmode compatibility

* ok

* makes centcompod default

* CentCom pods fall faster and are capatilized right

* yike

* yike2

* FASTER

* white space and default icon state

* spacemaniac thanks
 2018-06-04 00:37:24 -05:00
ShizCalev 67841c3f19 Fixes pocket items being deleted when monkeyizing (#38220) 2018-06-03 09:04:08 -05:00
ShizCalev 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
deathride58 340c6d2e83 Merge pull request #6824 from Citadel-Station-13/kevinz000-patch-1 
Roll Dice Verb
 2018-06-01 01:46:14 +00: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
LetterJay 1a87aa1b33 Merge pull request #6890 from Citadel-Station-13/upstream-merge-38052 
[MIRROR] Fixes accidental empty ahelp replies
 2018-05-25 22:51:51 -05:00
Dax Dupont 6ecadf6d93 Fixes accidental empty ahelp replies (#38052) 2018-05-25 09:36:23 -05:00
Tad Hardesty f41df8a925 Fix template preview being invisible on space turfs (#37971) 2018-05-25 07:35:31 -05:00
Jordan Brown 9f8ef69014 Merge pull request #37986 from AutomaticFrenzy/patch/sneaky-cyberboss 
Fix global proccalls not working
 2018-05-22 22:12:30 -05:00
kevinz000 db415cb507 Update dice.dm 2018-05-21 02:32:14 -07:00
kevinz000 2fd45f4eeb Create dice.dm 2018-05-21 02:31:14 -07:00
LetterJay 0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
LetterJay ea9b3622fd Merge branch 'master' into upstream-merge-37476 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2018-05-20 23:11:16 -05:00
Armhulen dc0ab280ac The Run Weather Verb, from "Adds acid geysers and seismic events to lavaland" (#37910) 
* run weather!

* there we go.
 2018-05-19 14:52:21 -05:00
deathride58 649314c455 Merge pull request #6682 from Citadel-Station-13/upstream-merge-37429 
[MIRROR] Update DMAPI to version 3.2.1.0
 2018-05-17 18:14:54 +00: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
Jordan Brown ff0b19427b Merge pull request #37771 from nichlas0010/patch-1 
lets admins see dsay if they're in-game and unconscious
 2018-05-11 17:30:14 -05:00
Jordan Brown 1a25c685a1 Update DMAPI to version 3.2.1.0 2018-05-08 21:33:58 -05:00
deathride58 6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
kevinz000 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
oranges 7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
vuonojenmustaturska d6b48869d8 Adds a stationloving component to replace a couple of flags and SSinbounds with (#37436) 
* station lovin' happened so fast

* Update stationloving.dm

* less qdel memes

* imbue soul signal

* rename imbue soul signal

* dupemode

* henk

* Update atoms_movable.dm

* Update nuclearbomb.dm

* Update nuclearbomb.dm
 2018-04-27 07:37:15 -05:00
deathride58 455216c094 Merge pull request #6525 from Citadel-Station-13/upstream-merge-37337 
[MIRROR] Adds a picker tool to advanced buildmode
 2018-04-27 09:40:12 +00:00