shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,778 Commits 5 Branches 0 Tags
2fd45f4eebf7e140aa8c4f4977ffbd704fefdf64
Commit Graph

57 Commits

Author SHA1 Message Date
vuonojenmustaturska
8f240d4246 Update interface.dm 2018-03-28 13:36:36 -05:00
deathride58
936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05: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
c526f3ec26 skin.dmf 2018-03-06 21:48:05 -06:00
AnturK
35b8e410be html_interface removal and crew monitoring console refactor. 2018-02-15 14:31:27 -06:00
deathride58
30ab115665 Makes Cit widescreen by default (#4374) 
* updates title screen to be WIDESCREEN

* increase default size of view window

* widescreen fullscreen overlays

* and finally, the switch can be hit

* Update skin.dmf

* readds splitter=75, the main screen breaks without it
 2018-02-04 21:29:48 -06:00
Poojawa
d7659ac6b2 sync with master 2018-01-31 07:02:55 -06:00
Leo
eb1aa38f17 Merge pull request #35103 from Cyberboss/ReportClientVersion 
Adds client version to ingame reporting
 2018-01-30 22:45:20 -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
8292194863 Makes report issue handle null round IDs and server names (#34124) 
* Makes report issue handle null round IDs and server names

* What Leo said

* Add missing bracket

* Parenthesis intensify
 2018-01-16 14:29:49 -06:00
deathride58
d1cec46035 aND FINALLY THE REST OF THE CODEBASE HOLY FUCK ITS DONE 2018-01-04 02:03:42 -05:00
XDTM
6b4099805f [Ready] Adds abductor Mind Interface Devices, and a gland HUD (#33209) 
* Adds abductor Mind Interface Devices, and a gland HUD

* .
 2017-12-18 20:29:37 -06:00
Emmett Gaines
e038319ba2 Quick access hotkeys for backpack and belt 2017-12-17 04:10:20 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
AnturK
4d247d88e6 Fixes canceling on rule/report/forum buttons (#33509) 
* Fixes report issue cancel

* Other buttons to while i'm at it.
 2017-12-14 03:41:54 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
Dax Dupont
4b6660814a Makes sillicon chat more visible (#33222) 
Made it green on black

Forgot to remove it at the bold thingy
 2017-12-06 06:20:27 -06:00
deathride58
6d1609af79 Lets you press Ctrl+H (or just H in hotkey mode) to stop pulling (#31848) 2017-10-19 04:41:23 -05:00
Jordan Brown
dc41460926 Issues created with the report issue button will contain the round ID (#30998) 
* Issues created with the report issue button will contain the round ID

* Update interface.dm

* More url encoding

* URL ENCODE THE PLANET!

* Server name

* Fix trevis

* Too many god damn fucking brackets here
 2017-10-03 18:28:17 -05:00
Jordan Brown
e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
Cactus
61d7ad4e82 Stylesheet and Wolves (#2389) 
* organizes the mam_bodyparts file by species

* Revert "organizes the mam_bodyparts file by species"

This reverts commit ab692973ba20c282becf0d69514b1ac03d5447f8.

* stylesheet fix

* wolf sprite edits

* conflict resolution

* wolf accessories readded
 2017-08-18 15:35:08 -04:00
LetterJay
dd00a61466 Update interface.dm 2017-08-16 09:26:58 -05:00
LetterJay
cff50c5771 Revert "Revert "[MIRROR] The wiki button now asks what page you want to be taken to"" 2017-08-16 09:25:32 -05:00
LetterJay
0ffaf66d1f Merge branch 'master' into upstream-merge-29690 2017-08-15 19:18:22 -05:00
LetterJay
c73e58d587 Revert "[MIRROR] The wiki button now asks what page you want to be taken to" 2017-08-14 08:19:27 -05:00
CitadelStationBot
bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00
CitadelStationBot
1b3ccfdfeb The wiki button now asks what page you want to be taken to 2017-08-13 01:26:42 -05:00
ktccd
6d3123f63c Readds borers (#1999) 
Readds the cortical borers and also syndi-borers.
Syndi-borers now gives a response if you try to use it multiple times
too quickly, and also prevents usage more than once while it's still
waiting for ghost responses.
 2017-07-14 19:28:52 -07:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
9ee0d6aa6d Makes oldchat show while goonchat loads, sends preload messages there. 2017-06-22 19:50:15 -05:00
LetterJay
9f40c381a4 fixes looc 2017-06-20 01:25:48 -05:00
LetterJay
42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
CitadelStationBot
4f9e6bd16d Proper fix for icon scaling preferences 2017-06-15 20:57:56 -05:00
LetterJay
b4b439ce95 fix datum verbs 2017-06-15 10:04:27 -05:00
LetterJay
226345d82a upstream-merge-28109 
upstream-merge-28352
 2017-06-13 01:10:21 -05:00
CitadelStationBot
d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
CitadelStationBot
a317d23a51 [MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916) 
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie

* fixes .rej
 2017-05-18 09:37:30 -05:00
CitadelStationBot
257cf986c5 Repaths C4 (#808) 
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
 2017-05-18 00:37:20 -05:00
LetterJay
a66e0c949e Merge pull request #832 from Citadel-Station-13/upstream-merge-23201 
[MIRROR] [READY]DATUM VERBS AND TOP MENUS!
 2017-05-10 23:05:37 -04:00
CitadelStationBot
faf8829d30 [MIRROR] Adamantine golem leadership (#785) 
* Adamantine golem leadership

* Update stylesheet.dm

* Delete golems.dm.rej

* Delete stylesheet.dm.rej

* Update golems.dm

* fuck line endings
 2017-05-08 22:16:09 -07:00
CitadelStationBot
181eee013e [READY]DATUM VERBS AND TOP MENUS! 2017-05-07 17:07:59 -05:00
LetterJay
8d37d21df4 Merge pull request #607 from Citadel-Station-13/upstream-merge-26624 
[MIRROR] Fixes changelog assets
 2017-04-28 08:19:41 -05:00
CitadelStationBot
caaf42815a Changes some << to to_chat 2017-04-28 06:14:47 -05:00
CitadelStationBot
404b2314c5 Fixes changelog assets 2017-04-27 15:38:42 -05:00
Poojawa
f866139c52 Admin ticket tgstyle (#493) 
* some porting

* other changes
 2017-04-20 22:00:47 -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
f3b6d9e007 Adds colours to languages that lack them (#395) 2017-04-15 14:47:39 -04: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
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