shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,352 Commits 5 Branches 0 Tags
db22ae64d471ea18a85f969fd19c52946b473154
Commit Graph
20 Commits
Author SHA1 Message Date
Ghommie 7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
Poojawa 8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58 3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
Jordan Brownandletterjay 9acc97dabe Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders 
Fix being able to pull mirage borders, others
 2018-06-16 15:50:27 -05:00
ShizCalevandletterjay 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -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
YPOQandletterjay 23f6567872 Fixes defibs/watertanks/gatling lasers (#37792) 2018-05-13 06:13:45 -05:00
orangesandCitadelStationBot 7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawaanddeathride58 5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
Jordan BrownandCitadelStationBot f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
JJRcopandCitadelStationBot ed6ec3d63a Removes some hrefs from logging (#34310) 
* Removes key_name_admin calls from logging

* Removes JMP from gibtonite reaction logs
 2018-01-12 07:04:39 -06:00
deathride58 d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
ACCountandCitadelStationBot 522b8383d8 [READY]Refactors reagent container types 2017-12-18 22:54:51 -06:00
vuonojenmustaturskaandCitadelStationBot fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
vuonojenmustaturskaandCitadelStationBot 7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
Tad HardestyandCitadelStationBot 9806de310d Remove NODROP from water tank misters (#32995) 2017-11-24 12:59:25 -06:00
ShizCalevandCitadelStationBot 831dde525e Makes drinking glasses smash when thrown 2017-11-20 02:45:22 -06:00
Jordan BrownandCitadelStationBot 4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
kevinz000andGitHub c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460) 
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
 2017-08-24 21:07:58 -07:00