shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,657 Commits 5 Branches 0 Tags
a62aa577f136ff6239ba19aae88b94d60bd83fd7
Commit Graph

9272 Commits

Author SHA1 Message Date
deathride58
a62aa577f1 Merge pull request #5854 from Citadel-Station-13/upstream-merge-36055 
[MIRROR] Techwebs update: Protolathe/Circuit imprinters combined into techfabs!
 2018-03-09 19:25:12 +00:00
deathride58
bc5447d97b Merge pull request #5857 from Citadel-Station-13/upstream-merge-35947 
[MIRROR] [READY] NTNet airlocks
 2018-03-09 19:24:35 +00:00
deathride58
aa0dbb5603 Merge pull request #5850 from Citadel-Station-13/upstream-merge-36070 
[MIRROR] Beacons are no longer radios
 2018-03-09 18:41:05 +00:00
deathride58
c615d9e6a0 Merge pull request #5870 from Citadel-Station-13/upstream-merge-36252 
[MIRROR] Sigils of transmission are no longer as eye-candy but also no longer as much of a CPU-sink
 2018-03-09 18:40:24 +00:00
deathride58
fdbd8aec97 Merge pull request #5869 from Citadel-Station-13/upstream-merge-36288 
[MIRROR] You can no longer SDQL select certain datums
 2018-03-09 18:40:09 +00:00
deathride58
a4751b0e94 Merge pull request #5868 from Citadel-Station-13/upstream-merge-36289 
[MIRROR] [s] Stop qdeling shit you're not supposed to
 2018-03-09 18:39:51 +00:00
deathride58
2a92653e68 Merge pull request #5867 from Citadel-Station-13/upstream-merge-36290 
[MIRROR] [s] Guards client.holder
 2018-03-09 18:39:35 +00:00
deathride58
8728d99ef9 Merge pull request #5866 from Citadel-Station-13/upstream-merge-36287 
[MIRROR] [S] Fixes GLOB protected vars exploit
 2018-03-09 18:39:19 +00:00
deathride58
f10552f7ef Update ntnet_interface.dm 2018-03-09 13:37:55 -05:00
deathride58
1387c8e3b6 Merge pull request #5855 from Citadel-Station-13/upstream-merge-35858 
[MIRROR] Mushroom people, revived!
 2018-03-09 18:37:29 +00:00
deathride58
78db80026d Merge pull request #5840 from Poojawa/reverts-crybaby-inducer 
Reverts crybaby inducer also does the sync things
 2018-03-09 18:36:42 +00:00
vuonojenmustaturska
1995f00032 Merge pull request #36252 from kevinz000/patch-463 
Sigils of transmission are no longer as eye-candy but also no longer as much of a CPU-sink
 2018-03-09 11:04:28 -06:00
vuonojenmustaturska
bf63e9ad3f Merge pull request #36288 from Cyberboss/BansKevinzFinally 
You can no longer SDQL select certain datums
 2018-03-09 10:45:58 -06:00
vuonojenmustaturska
ba5b5b433e Merge pull request #36289 from tgstation/Cyberboss-patch-4 
[s] Stop qdeling shit you're not supposed to
 2018-03-09 10:44:46 -06:00
vuonojenmustaturska
f25ed2503e Merge pull request #36290 from tgstation/Cyberboss-patch-5 
[s] Guards client.holder
 2018-03-09 10:28:17 -06:00
vuonojenmustaturska
27928bb1bf Merge pull request #36287 from tgstation/Cyberboss-patch-4 
[S] Fixes GLOB protected vars exploit
 2018-03-09 09:07:35 -06:00
LetterJay
ad0be11cbc Merge pull request #5865 from Citadel-Station-13/upstream-merge-36073 
[MIRROR] [READY AND TESTED]Projectiles now properly delete themselves if they try to move and their trajectory is at an invalid turf
 2018-03-09 04:53:41 -06:00
LetterJay
2f2aed48e4 Merge pull request #5864 from Citadel-Station-13/upstream-merge-36051 
[MIRROR] The ARM is now harder to obtain
 2018-03-09 04:53:23 -06:00
LetterJay
5ac9ce4a02 Merge pull request #5863 from Citadel-Station-13/upstream-merge-36058 
[MIRROR] Display cases can now have a list where to randomly spawn items from
 2018-03-09 04:53:10 -06:00
LetterJay
f207fe1f08 Merge pull request #5862 from Citadel-Station-13/upstream-merge-36233 
[MIRROR] Adds explicit check for numberless backpack contents in outfits.
 2018-03-09 04:52:46 -06:00
LetterJay
0e2531faaf Merge pull request #5861 from Citadel-Station-13/upstream-merge-36106 
[MIRROR] To go even further byond... the above lighting layer!
 2018-03-09 04:52:32 -06:00
LetterJay
c86aeef909 Merge pull request #5860 from Citadel-Station-13/upstream-merge-36195 
[MIRROR] Minor say code cleanup
 2018-03-09 04:52:18 -06:00
kevinz000
0905f68bbc Projectiles delete on invalid turf (#36073) 2018-03-09 02:26:05 -06:00
Robustin
e9d3af6e61 The ARM is now harder to obtain (#36051) 
* Added ARM difficulty

* Working edition Pt1

* Actually working Pt2

* Appropriate null check?

* Update narsie.dm
 2018-03-09 02:17:46 -06:00
Dax Dupont
27ff0a4f28 Display cases can now have a list where to randomly spawn items from (#36058) 
* Adds allowing display cases to pick from a random list

Keeps compatibility with older maps and moves trophy/plaque message to all display cases

* A bit more legible

* Refactors statues tool interaction code

* Don't override it already exists

* done
 2018-03-09 02:17:36 -06:00
oranges
cc691e16a1 Merge pull request #36233 from AnturK/nulllove 
Adds explicit check for numberless backpack contents in outfits.
 2018-03-08 23:21:28 -06:00
astralloop
e8548b392b To go even further byond... the above lighting layer! (#36106) 
* This, is my normal form.

* THIS, IS A SUPER SAIYAN ASCENDED.

I CALL IT A SUPER SAIYAN 2

* Update lighting.dm

* Spelling correction (#3)

* Update layers.dm

* Update chunk.dm

* TO GO BYOND....

* Update lighting.dm
 2018-03-08 22:43:23 -06:00
vuonojenmustaturska
8c87527005 Minor say code cleanup 2018-03-08 22:43:15 -06:00
vuonojenmustaturska
423302ac3c Merge pull request #36217 from Cruix/disease_freemove 
Sentient diseases get 2 minutes to select their initial host
 2018-03-08 22:42:57 -06:00
ACCount
f0cf4ad29d [READY] NTNet airlocks 2018-03-08 22:42:46 -06:00
deathride58
0f0ab49648 Update species.dm 2018-03-08 01:03:56 -05:00
deathride58
91d1aa5a74 Update flavor_misc.dm 2018-03-08 01:02:29 -05:00
deathride58
28f886791d Update mobs.dm 2018-03-08 01:01:42 -05:00
deathride58
56845788ac Merge pull request #5817 from Zna12/Filet-o-fish 
Filet-O-Sharkpeople
 2018-03-08 05:59:01 +00:00
deathride58
1850af961d Merge pull request #5852 from Citadel-Station-13/upstream-merge-36198 
[MIRROR] Disease fixes
 2018-03-08 05:58:11 +00:00
deathride58
fae68e4122 Merge pull request #5851 from Citadel-Station-13/upstream-merge-36202 
[MIRROR] Small spellcheck in traits
 2018-03-08 05:57:39 +00:00
deathride58
f836affa2e Merge pull request #5842 from Citadel-Station-13/upstream-merge-36191 
[MIRROR] Allow configuring ruin/empty space level count
 2018-03-08 05:57:03 +00:00
deathride58
828322d870 Merge pull request #5841 from Citadel-Station-13/upstream-merge-36190 
[MIRROR] Removes DEBUG from compile_options.
 2018-03-08 05:56:37 +00:00
Armhulen
e559fdca2c Mushroom people, revived! 2018-03-07 21:47:42 -06:00
kevinz000
91ac70a73e RND TECHWEBS: TECHFABS (#36055) 
Doing my little update piece by piece because I'm lazy and because storage PR is going to conflict everything ever.

Techfabs do not link to RND consoles, and have their own interface for producing things.
RND production machinery code refactored.
Techwebs have categories views instead of just a goddamn design list.
Old machinery will be kept in, as some places will keep them. Read: Engineering, robotics, etc.

experimental: Protolathes and circuit imprinters combined/changed to techfabs. All departments can now print related circuit boards. Engineering and science will keep their lathe/imprinter design by default at roundstart because they have specialized labs for those.
 2018-03-07 21:11:56 -06:00
vuonojenmustaturska
5cfc5f3730 Merge pull request #36198 from Cruix/disease_fixes 
Disease fixes
 2018-03-07 16:04:14 -06:00
vuonojenmustaturska
dfb0e9f7d6 Merge pull request #36202 from cebutris/lithenessk 
Small spellcheck in traits
 2018-03-07 16:03:01 -06:00
Dax Dupont
72e3ffa562 Beacons are no longer radios (#36070) 
* Refactors beacons

* Updates maps

* Done

* aaddddasddsafsdf
 2018-03-07 14:43:25 -06:00
Zna12
0941433022 Merge branch 'master' into Filet-o-fish 2018-03-07 10:41:09 -06:00
MMMiracles
48eac9e8c6 Thirteen Loko is actually dangerous (#36166) 
* makes thirteen loko do the stuff it warns the person about

* you sceam in terror as you use the web editor!
 2018-03-07 07:15:23 -06:00
Tad Hardesty
6402912a32 Allow configuring ruin/empty space level count - #36191 
Allows map configs to set how many ruin levels (def. 7) and how many empty levels (def. 1) that will be created. Most useful for landlocked stations, event/one-off stations with unusual composition, or testing situations such as RuntimeStation.
 2018-03-07 01:48:13 -06:00
Jordan Brown
61c2d7e435 Merge pull request #36190 from MrStonedOne/patch-489 
Removes DEBUG from compile_options.
 2018-03-07 01:32:41 -06:00
Poojawa
013c908ebf Update robot.dm 2018-03-06 23:39:06 -06:00
Poojawa
57bd3824a4 fixes things and mentors. 2018-03-06 23:34:54 -06:00
Poojawa
3c1e557302 compile issues 2018-03-06 22:35:16 -06:00