shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,375 Commits 5 Branches 0 Tags
96df41d76dde050e937f0ecb1c51e046d59e4aa8
Commit Graph
1041 Commits
Author SHA1 Message Date
Trilbyspacecloneandkevinz000 df2090a087 QM is a head (#7855) 2018-12-31 03:11:10 -08:00
deathride58andGitHub 725f1c822c Merge pull request #7714 from Tupinambis/LoneOperative 
Lone Ops but they are an actual threat (hopefully)
 2018-11-16 23:19:54 -05:00
deathride58andkevinz000 4d7a45ba41 reduces the revolution round end grace period to 10 minutes (#7730) 2018-11-16 14:54:33 -08:00
Tupinambis cc1b65f810 Lone ops now spawn without a bulldog and with a syndie softsuit rather than a hardsuit. 2018-11-10 19:29:15 -06:00
deathride58andkevinz000 dd1c7c765e Update code/game/gamemodes/revolution/revolution.dm (#7686) 2018-10-30 19:33:15 -07:00
Poojawa 91620218e4 some cherrypicked TG fixes and tweaks 2018-10-12 05:37:36 -05:00
Poojawa 8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58andGitHub c8a3f56af6 Merge pull request #7489 from Citadel-Station-13/nanites 
Nanites port
 2018-09-03 13:47:28 -04:00
LetterJay 1b11773cd9 DB port 2018-08-23 07:20:49 -05:00
kevinz000 b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
kevinz000andGitHub 1c430ad712 Update revolution.dm 2018-08-16 17:32:54 -07:00
kevinz000 2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
orangesandletterjay 1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-11 22:29:27 -05:00
Cameron!andkevinz000 8a989d2afe Quartermaster can no longer be a changeling or traitor (#7062) 
* Quartermasters can no longer be changelings

Consistency with heads of staff not being antagonists.

* oops forgot this

Thanks Glitchy
 2018-06-11 13:40:19 -07:00
CitadelStationBotandkevinz000 8413eb2888 [MIRROR] Squashes traitors under one path (#7049) 
* Squashes traitors under one path (#38332)

* Squashes traitors under one path
 2018-06-10 12:30:00 -07:00
LetterJayandkevinz000 fb4c1e8e28 Increases head jobs restricted from antag RNG (#6868) 
* restricts traitor and ling jobs

* Update changeling.dm

* Update traitor.dm
 2018-06-05 23:12:55 -07:00
KorPhaeronandletterjay 4b38136d79 Only load Reebe during clock cult (#38156) 
* Only load clock cult during clock cult

* Return FALSE
 2018-06-03 09:02:55 -05:00
deathride58andkevinz000 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
LetterJayandGitHub 5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJayandGitHub 359d31238d Merge branch 'master' into upstream-merge-37486 2018-05-21 11:59:57 -05:00
LetterJayandGitHub 931a950adb Merge branch 'master' into upstream-merge-37486 2018-05-21 08:59:32 -05:00
LetterJayandGitHub e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
LetterJayandGitHub 0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
ShizCalevandletterjay 49bf67ed1d Updates BYOND links to use HTTPS (#37918) 
* Updates BYOND links to use HTTPS

* revert

* if -> If
 2018-05-20 15:31:28 -05:00
Nichandletterjay ed556b2c0e Removes the ability for RD's to steal hand teles (#37908) 2018-05-18 19:51:06 -05:00
vuonojenmustaturskaandletterjay aa7a27420c Merge pull request #37863 from AnturK/rr4 
Fixes changeling team objectives (a bit)
 2018-05-16 14:35:49 -05:00
deathride58andGitHub 50f8779fc0 Merge branch 'master' into upstream-merge-37486 2018-05-06 07:15:48 +00:00
deathride58andGitHub 6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
ShizCalevandCitadelStationBot b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
deathride58andGitHub c7ea689679 Update nuclear.dm 2018-05-02 10:33:50 -04:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
vuonojenmustaturskaandCitadelStationBot 3f6167d08e Moves several clothing-specific flags from /atom to their proper type 2018-04-28 13:21:48 -05:00
orangesandCitadelStationBot 7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
deathride58andkevinz000 862898526d Gamemode and gamemode vote obfuscation (Plus hub entry rework) (#6276) 
* adds gamemode/gamemode vote obfuscation, redesigns hub entry

* ternaries: the easiest way to obfuscate your code to the point where even you can't read it

* FUCK

* changes the inaccuracy chance from 1/10 to 1/5
 2018-04-27 07:40:45 -07:00
Poojawa cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
YPOQandCitadelStationBot 42372b8d04 Fixes eminences not being recognized as servants of ratvar (#37070) 
* Fixes eminences not being recognized as servants of ratvar

* Readds istype check
 2018-04-10 20:21:37 -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
LetterJayandGitHub 961c69a8e5 Merge pull request #6193 from Citadel-Station-13/upstream-merge-36800 
[MIRROR] Adds check to keep observers from being recognized as servants of ratvar
 2018-03-31 18:43:34 -05:00
AlexTheSysop42andCitadelStationBot 360eb223b3 Adds check to keep observers from being recognized as servants of ratvar (#36800) 
* Comments out code to try to fix a bug

* fixes servant ghosts being trapped on Reebe

* protip: next time don't commit to master

* ghosts no longer count as servants

* Undoes ghost check, moved to is_servant_of_ratvar

* change istype to isliving
 2018-03-31 06:17:10 -05:00
Jordan BrownandCitadelStationBot 9520546277 Merge pull request #36772 from vuonojenmustaturska/dertpartment 
Removes derpartment
 2018-03-29 08:34:02 -05:00
deathride58andGitHub 15472805ba Merge pull request #6055 from Poojawa/cmo-hypo-objective 
Removes the old hypospray from CMO closet, updates tator objective
 2018-03-27 17:41:44 +00:00
CitadelStationBotandPoojawa 4f254f181f [MIRROR] Sintouched antag datums (#6096) 
* Sintouched antag datums (#36561)

* Sintouched stuff

* hudz

* These are boring and when they happen they happen en masse so let's just list them

* undefs

* Sintouched antag datums
 2018-03-26 04:19:49 -05:00
Poojawa e52e52fa5d Removes the old hypospray from CMO closet, updates tator objective 2018-03-21 20:37:29 -05:00
CitadelStationBotandPoojawa 980d69dde3 [MIRROR] I'm a dumb idiot and forgot to change the antag_rep values (#6000) 
* I'm a dumb idiot and forgot to change the antag_rep values

* merge conflict
 2018-03-19 21:25:01 -05:00
CruixandCitadelStationBot b4457dfefd Clown Ops 2018-03-17 07:52:41 -05:00
CitadelStationBotandPoojawa 4439fa7e98 [MIRROR] why doesn't nukeops actually check required_enemies (#5908) 
* why doesn't nukeops actually check required_enemies (#36056)

* which idiot added pre_setup()

* was I drunk

* Update nuclear.dm

* why doesn't nukeops actually check required_enemies
 2018-03-12 07:04:04 -05:00
CitadelStationBotandPoojawa 64abde83eb [MIRROR] Cult Fixes and Minor Balance Tweaks (#5913) 
* Cult Fixes and Minor Balance Tweaks (#36092)

* Fixes and Balance Tweaks

* Faster deconversions

* Shade nerf

* Cult Fixes and Minor Balance Tweaks
 2018-03-12 07:01:54 -05:00
Poojawa 95cb6b23f2 controllers, datums, game 2018-03-06 21:16:46 -06:00
PoojawaandGitHub 86b11050b6 Citadel's folder's end (#5828) 
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
 2018-03-06 17:40:48 -06:00