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

704 Commits

Author SHA1 Message Date
ShizCalev
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
deathride58
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
ShizCalev
a7f13f15cf Fixes Adminorazine killing ash lizards (#37872) 
* Fixes Adminorazine killing ash lizards

* this should do it...
 2018-05-17 10:24:59 -05:00
LetterJay
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
LetterJay
ca86c93e70 Merge pull request #6676 from Citadel-Station-13/upstream-merge-37406 
[MIRROR] Adds (fake) ambient occlusion as a client preference
 2018-05-13 11:52:23 -05:00
LetterJay
289cbbb375 Merge pull request #6718 from Citadel-Station-13/upstream-merge-37697 
[MIRROR] Makes the redirect component able to transfer with changeturfs
 2018-05-13 03:28:57 -05:00
LetterJay
80aad142a4 Merge branch 'master' into upstream-merge-37406 2018-05-13 03:28:37 -05:00
LetterJay
f21cac1af2 Merge pull request #6700 from Citadel-Station-13/upstream-merge-37399 
[MIRROR] Use spritesheets to reduce time spent sending PNG assets by 90+%
 2018-05-12 17:04:23 -05:00
Emmett Gaines
b036b1e519 Makes the redirect component able to transfer with changeturfs (#37697) 2018-05-12 16:29:28 -05:00
deathride58
37b9d589ad Merge pull request #6679 from Citadel-Station-13/upstream-merge-37396 
[MIRROR] Track admin observer time
 2018-05-11 03:45:11 +00:00
deathride58
7acf54f5fc Update misc.dm 2018-05-10 23:37:20 -04:00
kevinz000
3819a5a9b5 Fixes EMPs (#37656) 2018-05-10 01:33:25 -05:00
Tad Hardesty
111ad79eab Use spritesheets to reduce time spent sending PNG assets by 90+% 2018-05-09 22:44:57 -05:00
Jordan Brown
1a25c685a1 Update DMAPI to version 3.2.1.0 2018-05-08 21:33:58 -05:00
Jordan Brown
baee4dead5 Merge pull request #37396 from KorPhaeron/mrcitruswantsyoutoclockin 
Track admin observer time
 2018-05-08 13:38:13 -05:00
deathride58
bc6fbeb9fe Adds (fake) ambient occlusion as a client preference 2018-05-07 22:08:08 -05:00
oranges
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
deathride58
55566461c6 Merge pull request #6601 from Citadel-Station-13/upstream-merge-37565 
[MIRROR] Modifies component transfer to make ChangeTurf able to transfer components
 2018-05-02 13:59:14 +00:00
deathride58
5c40a38457 Merge pull request #6609 from Citadel-Station-13/upstream-merge-37584 
[MIRROR] Readds missing nuked narsie cinematic.
 2018-05-02 01:30:19 +00:00
deathride58
d26ba53e91 Merge pull request #6596 from Citadel-Station-13/upstream-merge-37513 
[MIRROR] Adds traits for a character's preference towards pineapples.
 2018-05-02 01:25:04 +00:00
deathride58
e26f1cd78b Merge pull request #6553 from Citadel-Station-13/upstream-merge-37165 
[MIRROR] NTNet improvements!
 2018-05-02 01:17:10 +00:00
AnturK
76302a217e Readds missing nuked narsie cinematic. (#37584) 2018-05-01 11:05:16 -05:00
Jordan Brown
1675490652 Modifies component transfer to make ChangeTurf able to transfer components 2018-04-30 21:16:48 -05:00
Jordan Brown
12eb6a8a97 Merge pull request #37513 from ShizCalev/pineapple-memes 
Adds traits for a character's preference towards pineapples.
 2018-04-30 13:02:05 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58
b7cdd6a7fd Update networks.dm 2018-04-29 18:48:26 -04:00
LetterJay
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
LetterJay
b565ef9171 Merge pull request #6557 from Citadel-Station-13/upstream-merge-37384 
[MIRROR] Re-adds and reworks fusion.
 2018-04-28 14:07:08 -05:00
as334
9b36d6c4d9 Re-adds and reworks fusion. (#37384) 
add: Fusion is back
add: Fusion now happens with large quantities of hot plasma and CO2, consuming all the plasma rapidly and producing large amounts of energy. Other gases can also effect the performance of the reaction.
add: Fusion now produces radiation. Be careful around reactors.
fix: fixes fusion dividing by zero and destroying everything
code: Gas reactions now have access to where they are occurring
fix: Prevents some other reactions from producing matter from nothing
 2018-04-28 01:01:47 -05:00
kevinz000
6ed120aad4 NTNet improvements! 2018-04-27 20:24:28 -05:00
Emmett Gaines
ce5ccc8498 Removes the signals on process procs (#37461) 2018-04-27 13:04:24 -05:00
vuonojenmustaturska
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
f2b0456dc5 defines, helpers, onclick 2018-04-22 23:56:25 -05:00
pigeons
4d0597ad5b Parenthesizes some macros (#37212) 
* parenthesizes some macros

* A couple more macro definition parenthesizing
 2018-04-16 03:47:46 -05:00
Putnam3145
5eab3eb454 Rounded the last digit of pi correctly (#37148) 
It's important, fellas. Makes pi 0.000007 wrong instead of 0.00009 wrong.
 2018-04-13 07:51:06 -05:00
deathride58
eebe38dc39 Merge pull request #6367 from Citadel-Station-13/upstream-merge-37136 
[MIRROR] Removes some unused math defines/procs
 2018-04-11 21:27:58 +00:00
deathride58
ba276cf374 Merge pull request #6373 from Citadel-Station-13/upstream-merge-37116 
[MIRROR] Fixes order of operations math errors with gas defines.
 2018-04-11 21:26:47 +00:00
The_Dreamweaver
adac58f0c2 Fixes order of operations math errors with gas defines. 2018-04-11 15:02:22 -05:00
vuonojenmustaturska
d559fc1bd3 remove 512 version checks 2018-04-11 14:26:41 -05:00
ShizCalev
e63553e278 Removes some unused math defines/procs 2018-04-11 14:15:14 -05:00
Poojawa
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 Brown
0ddf202682 Merge pull request #36872 from kevinz000/totally_not_a_feature 
GC debugging features
 2018-04-06 09:17:11 -05:00
Grandmother of 50
2d710e863f Archaeology... .... Code Cleanup (One day I promise!) (#36490) 
* Improves Arch Code

* defines and stack_traces null values

* relocates 2 defines to "non-signal" section
 2018-04-02 18:14:15 -05:00
LetterJay
dd579e35bc Merge pull request #6183 from Citadel-Station-13/upstream-merge-36548 
[MIRROR] Added a new ability to sentient diseases
 2018-04-01 19:50:43 -05:00
LetterJay
d63ff01364 Update components.dm 2018-04-01 17:38:50 -05:00
LetterJay
24d4b310cd Merge pull request #6082 from Citadel-Station-13/upstream-merge-36147 
[MIRROR] [READY] ~SPELL CARDS~, homing projectiles, and more!
 2018-04-01 01:01:55 -05:00
kevinz000
6e64e8e601 Failing to latejoin as a job when the latejoin panel is already open now makes a more descriptive error message (#36794) 
* job availability

* avail

* Boop
 2018-03-31 06:17:20 -05:00
Cruix
0b7f816033 Added a new ability to sentient diseases 2018-03-31 06:14:54 -05:00
kevinz000
4773743eab Fixes wet floor scaling (#36697) 
* Fixes wet floor scaling

* Meh lets not
 2018-03-26 10:49:42 -05:00