shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,203 Commits 5 Branches 0 Tags
321df15afd27225bb830c142a11b615fcb6ed1fc
Commit Graph
654 Commits
Author SHA1 Message Date
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
CitadelStationBotandkevinz000 8502508c21 [MIRROR] Anomalies can now be deconstructed for techwebs for 10k points (#6850) 
* Anomalies can now be deconstructed for techwebs for 10k points

* Update research.dm
 2018-05-27 17:26:36 -07:00
LetterJayandGitHub 54510e95b1 Merge pull request #6904 from Citadel-Station-13/upstream-merge-38055 
[MIRROR] Enable Goonchat ping during the lobby
 2018-05-26 18:40:25 -05:00
LetterJayandGitHub c512fe52c8 Merge pull request #6898 from Citadel-Station-13/upstream-merge-38008 
[MIRROR] Fixes some edge cases in sstimer that could cause a timer to run before it was expecting to.
 2018-05-26 18:38:07 -05:00
Jordan Brownandletterjay cf4ef9a59f Merge pull request #38055 from AutomaticFrenzy/patch/ssping-lobby 
Enable Goonchat ping during the lobby
 2018-05-25 11:06:36 -05:00
Jordan Brownandletterjay 6e9cad688c Merge pull request #38008 from MrStonedOne/ISawSSTimerFloatingInMyDreams 
Fixes some edge cases in sstimer that could cause a timer to run before it was expecting to.
 2018-05-25 10:51:56 -05:00
Jordan Brownandletterjay d0cd2f4f95 Merge pull request #38009 from MrStonedOne/deletedcrackdown 
Timers on qdeleted objects is no longer supported.
 2018-05-25 10:50:44 -05:00
LetterJayandGitHub b89254ced7 Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448 
[MIRROR] [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
 2018-05-24 11:58:57 -05:00
LetterJayandGitHub de44ac926e Merge branch 'master' into upstream-merge-37665 2018-05-23 10:14:10 -05:00
orangesandletterjay c27d97a6e5 Merge pull request #37934 from AutomaticFrenzy/patch/ssping 
Migrate goonchat pings to a subsystem
 2018-05-21 16:40:29 -05:00
cyclownsandletterjay 7cc9d9103d Refactors hydrocarbon combustion + other general atmos code changes (#37600) 
* splits hydrocarbon combustion + other stuff

* nob max() thing

* whoops

* remove proc + new define
 2018-05-21 03:21:08 -05:00
kevinz000andletterjay d54667c81b [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT 2018-05-19 18:51:51 -05:00
Jordan Brownandletterjay a61457cd47 Merge pull request #37838 from Jordie0608/ithoughtaboutmakingthissendanemailbutidontwanttodrownmyinbox 
Query debug logging
 2018-05-17 21:38:41 -05:00
deathride58andGitHub 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
Jordieandletterjay 68fcab96a5 Splits up round table initialize, start, end and shutdown 2018-05-15 02:12:50 -05:00
LetterJayandGitHub 0877bdd4e5 Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646 
[MIRROR] Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
 2018-05-15 00:47:59 -05:00
Tad Hardestyandletterjay 111ad79eab Use spritesheets to reduce time spent sending PNG assets by 90+% 2018-05-09 22:44:57 -05:00
Jordan Brownandletterjay 1a25c685a1 Update DMAPI to version 3.2.1.0 2018-05-08 21:33:58 -05:00
orangesandCitadelStationBot e0412f6325 Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code 2018-05-06 16:37:13 -05:00
Jordan BrownandCitadelStationBot da2ea729ee Merge pull request #37561 from AnturK/customloadingfix 
Fixes loading custom aways.
 2018-04-30 21:19:05 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
LetterJayandGitHub 44f966d0eb Merge pull request #6540 from Citadel-Station-13/upstream-merge-37461 
[MIRROR] Removes the signals on process procs
 2018-04-29 02:24:04 -05:00
LetterJayandGitHub 811cc06188 Merge pull request #6536 from Citadel-Station-13/upstream-merge-37436 
[MIRROR] Adds a stationloving component to replace a couple of flags and SSinbounds with
 2018-04-28 01:36:04 -05:00
Emmett GainesandCitadelStationBot ce5ccc8498 Removes the signals on process procs (#37461) 2018-04-27 13:04:24 -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
vuonojenmustaturskaandCitadelStationBot 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
Poojawa 0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
Poojawa e5f9765d2a datums/controller stuff 2018-04-23 00:02:42 -05:00
AnturKandCitadelStationBot 54ef24b75a Adds a note if the loaded away is custom or not in the logs. (#37305) 2018-04-22 19:17:05 -05:00
LetterJayandGitHub 68a1d541b1 Merge pull request #6441 from Citadel-Station-13/upstream-merge-37223 
[MIRROR] Fixes some defines and value
 2018-04-22 02:43:26 -05:00
AnturKandCitadelStationBot 68c6848a70 Fixes trophies. (#37266) 2018-04-17 05:25:41 -05:00
AnturKandCitadelStationBot 31efa96a01 Fixes some defines. (#37223) 2018-04-16 08:32:48 -05:00
AnturKandCitadelStationBot 15ac393773 Filters out duplicate trophies. 2018-04-15 12:42:41 -05:00
kevinz000andCitadelStationBot 44a273f6b8 Changes ntnet address assignment from numerical ascending to 16 hexadecimal randomized seeded (in English, everything is now randomized instead of predictable) (#37167) 
* Emergency NTNet patch

* ok

* @naksu

* explicit null
 2018-04-14 04:43:25 -05:00
deathride58andGitHub e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
LetterJayandGitHub ba03df8c86 Merge pull request #6321 from Citadel-Station-13/upstream-merge-37053 
[MIRROR] Fixes overflow role latejoin
 2018-04-09 16:38:14 -05:00
KorPhaeronandCitadelStationBot 46b7b95897 Finishes overflow roles (#37053) 2018-04-09 05:10:14 -05:00
CosmicScientistandCitadelStationBot 5d1b06c2e3 Bird and Chasm phobias (#36430) 
CosmicScientist

add: Top Nanotrasen scientists have diagnosed two new phobias! Birds and chasms! Good luck Chief Engineers and Miners.


Modified fear of doctors to include plague doctor suit. Who isn't afraid of Medieval medicine?
 2018-04-08 16:24:34 -05:00
deathride58andGitHub 120457d8fd Merge pull request #6088 from Citadel-Station-13/FixesItAll 
Makes sure the server can never ever crash ever again
 2018-04-08 04:18:37 +00: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
deathride58andGitHub 832939d3ac Merge pull request #6282 from Citadel-Station-13/upstream-merge-36989 
[MIRROR] Logs the load away mission verb.
 2018-04-08 02:25:25 +00:00
deathride58andGitHub 1d1c0a5ebb Merge pull request #6284 from Citadel-Station-13/upstream-merge-36560 
[MIRROR] [READY]AI latejoins
 2018-04-08 02:25:10 +00:00
deathride58andGitHub 57f0cc35b5 Update mapping.dm 2018-04-06 20:54:12 -04:00
deathride58andGitHub b88da782aa Update job.dm 2018-04-06 20:53:15 -04:00
deathride58andGitHub bae5e5c81d Merge pull request #6291 from Citadel-Station-13/upstream-merge-36997 
[MIRROR] Fixes dead chat announcements not using real name.
 2018-04-07 00:49:33 +00:00
Jordan BrownandCitadelStationBot 0ddf202682 Merge pull request #36872 from kevinz000/totally_not_a_feature 
GC debugging features
 2018-04-06 09:17:11 -05:00
Jordan BrownandCitadelStationBot 554ed22603 Merge pull request #36997 from DaxDupont/is-this-real-life 
Fixes dead chat announcements not using real name.
 2018-04-06 09:08:48 -05:00
kevinz000andCitadelStationBot 38ae8beefc [READY]AI latejoins 2018-04-06 00:44:31 -05:00
AnturKandCitadelStationBot 0efb82be90 Logs the load away mission verb. 2018-04-06 00:44:06 -05:00
LetterJayandGitHub 4f032913c7 Merge pull request #6171 from Citadel-Station-13/upstream-merge-36702 
[MIRROR] increases MAX_THROWING_DIST
 2018-03-31 06:21:47 -05:00