shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,820 Commits 5 Branches 0 Tags
b8d6bc53cf2e6affe4e57cdcbf67c3fb8d11a0f3
Commit Graph
71 Commits
Author SHA1 Message Date
deathride58andGitHub a9b3b0b7f4 Merge branch 'master' into upstream-merge-36242 2018-03-09 20:38:39 +00:00
QustinnusandCitadelStationBot 68757f1b44 Small moodie balance changes 2018-03-07 22:39:39 -06:00
QustinnusandCitadelStationBot a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00
CitadelStationBotandPoojawa a2e6253f00 [MIRROR] Disease antagonist (#5815) 
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
 2018-03-05 15:20:59 -06:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
deathride58andGitHub 389e2ac804 Update remains.dm 2018-02-05 10:54:43 -05:00
MMMiraclesandCitadelStationBot 4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
CitadelStationBotandPoojawa d4c270fe4a [MIRROR] [READY] Fixes de-initialization of cleanables-ash (#5295) 
* [READY] Fixes de-initialization of cleanables-ash

* Update morgue.dm

* Update morgue.dm
 2018-02-05 03:20:09 -06:00
CitadelStationBotandPoojawa 662f1904aa [MIRROR] Lavaland bomb runtime fix (#5246) 
* Lavaland bomb runtime fix

* Update cleanable.dm
 2018-02-05 00:56:37 -06:00
CitadelStationBotandPoojawa 17ccbb4a53 [MIRROR] Adds tiny shards (#5299) 
* Adds tiny shards (#35070)

* Adds tiny shards

* .

* .

* .

* .

* .

* .

* Adds tiny shards
 2018-02-05 00:53:52 -06:00
CitadelStationBotandPoojawa 8fe05c8171 [MIRROR] Allows blobs to destroy decals (#5279) 
* Allows blobs to destroy decals

* Allows blobs to destroy decals
 2018-02-04 23:14:15 -06:00
Poojawa fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
PoojawaandGitHub 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 BrownandCitadelStationBot 070a4bc0c4 Merge pull request #34817 from ninjanomnom/stop-pointing-at-me 
Makes the point effect not trigger movement code
 2018-01-24 06:12:29 -06:00
Jordan BrownandCitadelStationBot 7a6796eb76 Merge pull request #34620 from ShizCalev/color-correction 
Corrects tile color defines
 2018-01-19 12:24:00 -06:00
deathride58andCitadelStationBot 757dfbbdc5 Ports Aurora's floor tile color turf decals (For mappers) (#34492) 
* ports Aurora's floor tile color decals

* replaces aurora's decals with new ones that actually have detail, renames turf_decal/corner to turf_decal/tile

* corner > tile decal
 2018-01-18 21:28:14 -06:00
deathride58andGitHub e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
Jordan BrownandCitadelStationBot 801eab4c3c Fixes decals being created on bad turfs (#34121) 
* Fixes decals being created on bad turfs

* Fix decal check

* squash me daddy
 2018-01-07 18:51:09 -06:00
deathride58andGitHub d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
Jordan BrownandCitadelStationBot 505fc95ad0 Merge pull request #34034 from deathride58/goonstylecrayons 
Makes crayons draw at the location you click
 2018-01-05 09:28:07 -06:00
deathride58 d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
orangesandCitadelStationBot 269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
LetterJayandGitHub 1b6b8a7c00 Update cleanable.dm 2017-12-19 17:46:15 -06:00
LetterJayandGitHub 0a05b499fd Update cleanable.dm 2017-12-19 17:14:57 -06:00
LetterJayandGitHub 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
vuonojenmustaturskaandCitadelStationBot 7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
deathride58 ddbb5c34d4 manual mirrors 2017-11-21 14:06:28 -05:00
WJohnandCitadelStationBot e8ddae5d98 Cleans up floors.dmi a bit and adds new turf decals. 2017-11-20 20:48:06 -06:00
LetterJayandGitHub 41b60c6d1e Merge pull request #3845 from Citadel-Station-13/upstream-merge-32441 
[MIRROR] Crayon rotation as a type var
 2017-11-09 03:18:17 -06:00
LetterJayandGitHub a297f4bc7f Update crayon.dm 2017-11-08 02:22:48 -06:00
ShizCalevandCitadelStationBot 88e7e8d2cb Fixes turf_decal layering 2017-11-07 21:38:53 -06:00
JordieandCitadelStationBot 5bcaf7a3b1 Crayon rotation as a type var 2017-11-07 08:03:32 -06:00
Emmett GainesandCitadelStationBot a9f07518a7 Shuttle rotation refactor and significant performance upgrade 2017-10-31 20:23:57 -05:00
Kyle Spier-SwensonandCitadelStationBot 927dea03ce Fixes excessive overlay churn (#32065) 
* Fixes excessive overlay chern

Adding an overlay on every cross and uncross of every player (with how bloody the station gets this is called on just about every fucking movement, some times multiple times if there are multiple types of stains (oil, blood, alien, etc) is an excessive as fuck amount of chern in the overlay subsystem.

This is likely the cause of overlays being so high.

* I APOLOGIZE FOR NOTHING!
 2017-10-25 21:45:46 -05:00
deathride58 c1bd7bc6ba Map syncs 1 - Code syncs 2017-10-23 12:56:26 -04:00
LeoandCitadelStationBot 28656d3347 Merge pull request #31809 from ShizCalev/helper-cleanup 
Cleans up some istypes not using helpers
 2017-10-17 19:21:14 -05:00
Tad HardestyandCitadelStationBot 01ecdff51a Improve extended examination text for many objects (#31381) 
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
 2017-10-10 03:07:38 -05:00
XDTMandCitadelStationBot 7a0ce217db Refactors virus spreading 2017-10-09 08:55:57 -05:00
LetterJayandGitHub 2b42ad5200 Update decal.dm 2017-10-06 22:22:35 -05:00
ShizCalevandCitadelStationBot 0dc8bd5d83 Sets turf decal layer 2017-10-06 03:12:07 -05:00
CitadelStationBotandPoojawa e4db027692 [MIRROR] Fixes to more Initialize procs (#2733) 
* Fixes to more Initialize procs

* Update ai_monitored.dm

* Update cleanable.dm

* Update instruments.dm

* Update musician.dm

* Update noticeboard.dm

* Update mimic.dm

* Update interactive.dm
 2017-09-13 22:54:12 -05:00
LetterJay c2a41c9b51 commit 2017-09-13 06:04:22 -05:00
LetterJayandkevinz000 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBotandkevinz000 b5e7f7f7fe [MIRROR] Adds defines for mouse_opacity (#2381) 
* Adds defines for mouse_opacity

* Delete misc.dm.rej

* Update misc.dm
 2017-08-21 20:29:37 -07:00
CitadelStationBot bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00
kevinz000andGitHub bbcad2fa58 Proper mirror PR for the disease refactor because I fucked up the first one. (#2026) 
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
 2017-07-31 23:41:22 -07:00
CitadelStationBotandkevinz000 0f23a00e40 Cleaned up some turf decals, fixed beach away mission (#2152) 2017-07-26 22:56:55 -07:00
kevinz000andGitHub 44742cb115 im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025) 
* Revert "Automatic changelog generation for PR #2021 [ci skip]"

This reverts commit 9d0cd37dd3.

* Revert "Disease Refactor (#2021)"

This reverts commit f2ac487927.
 2017-07-15 11:41:36 -07:00
CitadelStationBotandkevinz000 f2ac487927 Disease Refactor (#2021) 2017-07-15 11:40:49 -07:00