shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,046 Commits 5 Branches 0 Tags
b565ef9171ec0084aed01af3b3afa231cbea59a1
Commit Graph

10132 Commits

Author SHA1 Message Date
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
LetterJay
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
LetterJay
ec1a16fed0 Merge pull request #6535 from Citadel-Station-13/upstream-merge-37480 
[MIRROR] Fixes pineapple pizza not actually tasting like pineapple
 2018-04-28 01:35:41 -05:00
LetterJay
d10dcf7cd7 Merge pull request #6534 from Citadel-Station-13/upstream-merge-37445 
[MIRROR] you can now print tools using the integrated circuit printer again
 2018-04-28 01:34:59 -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
deathride58
ab3c55ab23 replaces randomized wires with departmental wires (#6376) 2018-04-27 07:42:09 -07:00
deathride58
d2fbb671ba Removes ADS + other combat mode tweaks, makes adjuststaminabuffer() affect borg cells, adds sprinting for borgs (#6498) 
* adjuststaminabuffer() now drains borg cells, borgs can now sprint, removes aiming down sights, combat mode now makes you face your cursor

* forgot to ctrl+s here
 2018-04-27 07:41:31 -07:00
deathride58
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
deathride58
681bbb1bb0 Adds follow link to admin LOOC messages (#6378) 
* adds follow link to looc messages shown to admins

* fixes
 2018-04-27 07:39:01 -07: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
oranges
08f9dc0e8a Merge pull request #37480 from ShizCalev/pineapple-meme 
Fixes pineapple pizza not actually tasting like pineapple
 2018-04-27 07:29:39 -05:00
Nich
c9702d2a5c you can now print tools using the integrated circuit printer again (#37445) 
* you can now print tools again

* I'm severely mentally retarded

* Update printer.dm
 2018-04-27 05:17:42 -05:00
deathride58
c0bc86ef21 Merge pull request #6533 from Citadel-Station-13/upstream-merge-37452 
[MIRROR] [s]fixes significant invulnerability exploit
 2018-04-27 09:43:11 +00:00
deathride58
532ccc412c Merge pull request #6532 from Citadel-Station-13/upstream-merge-37373 
[MIRROR] Fixes missing augmentation hands
 2018-04-27 09:42:46 +00:00
deathride58
91a6274e81 Merge pull request #6530 from Citadel-Station-13/upstream-merge-37435 
[MIRROR] Updates syndicate hardsuit uplink description to not say it's unremovable
 2018-04-27 09:42:05 +00:00
deathride58
52e35b230f Merge pull request #6529 from Citadel-Station-13/upstream-merge-37441 
[MIRROR] Analyzers show temperature in Kelvin as well as Celsius now
 2018-04-27 09:41:46 +00:00
deathride58
28dd1a28ab Merge pull request #6528 from Citadel-Station-13/upstream-merge-37439 
[MIRROR] admins can now var edit the sound frogs make when they are stepped on
 2018-04-27 09:41:14 +00:00
deathride58
eb0c82708c Merge pull request #6527 from Citadel-Station-13/upstream-merge-37443 
[MIRROR] Paperwork Error Event
 2018-04-27 09:40:57 +00:00
deathride58
455216c094 Merge pull request #6525 from Citadel-Station-13/upstream-merge-37337 
[MIRROR] Adds a picker tool to advanced buildmode
 2018-04-27 09:40:12 +00:00
deathride58
80a4f04d94 Merge pull request #6524 from Citadel-Station-13/upstream-merge-37342 
[MIRROR] Makes it possible to see tiles past z transitions
 2018-04-27 09:39:52 +00:00
deathride58
d972ecc891 Merge pull request #6523 from Citadel-Station-13/upstream-merge-37407 
[MIRROR] Removes Acid from Remaining Circuits
 2018-04-27 09:39:29 +00:00
deathride58
28904ec033 Merge pull request #6522 from Citadel-Station-13/upstream-merge-37431 
[MIRROR] New Trait: Acute Blood Deficiency
 2018-04-27 09:38:19 +00:00
deathride58
85f0c174c1 Merge pull request #6520 from Citadel-Station-13/upstream-merge-37313 
[MIRROR] Makes the experimentor only output one copy of something.
 2018-04-27 09:37:33 +00:00
deathride58
3bb8902846 Merge pull request #6518 from Citadel-Station-13/upstream-merge-37413 
[MIRROR] Gives admins the D(say) hotkey + fixes buildmode permissions
 2018-04-27 09:36:44 +00:00
deathride58
5172d2ae09 Merge pull request #6517 from Citadel-Station-13/upstream-merge-37416 
[MIRROR] Fixes the stock market having random, spontaneous exponential value spikes.
 2018-04-27 09:36:23 +00:00
deathride58
2ee4d3e77d Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326 
[MIRROR] Removes SCP_294
 2018-04-27 09:35:43 +00:00
deathride58
927b3787bf Merge pull request #6514 from Citadel-Station-13/upstream-merge-37412 
[MIRROR] Adds ckey to some of the ban prompts.
 2018-04-27 09:35:10 +00:00
deathride58
13c28b9ff1 Merge pull request #6513 from Citadel-Station-13/upstream-merge-37403 
[MIRROR] Adds grind_results to coins and diamonds
 2018-04-27 09:34:49 +00:00
deathride58
bf26599ac3 Merge pull request #6512 from Citadel-Station-13/upstream-merge-37391 
[MIRROR] Improves messaging for blood contracts
 2018-04-27 09:32:21 +00:00
deathride58
62d64a8647 Merge pull request #6509 from Citadel-Station-13/upstream-merge-37402 
[MIRROR] Fixes autosurgeon icon
 2018-04-27 09:32:05 +00:00
deathride58
48a5639f8a Merge pull request #6508 from Citadel-Station-13/upstream-merge-37390 
[MIRROR] Adds salt to chips and jerky
 2018-04-27 09:31:23 +00:00
deathride58
f8406d1bfe Merge pull request #6507 from Citadel-Station-13/upstream-merge-37375 
[MIRROR] fixes cqc working outside chef assigned areas
 2018-04-27 09:31:04 +00:00
deathride58
5a399f4ce9 Merge pull request #6506 from Citadel-Station-13/upstream-merge-37411 
[MIRROR] Improves logging/messaging for singularities.
 2018-04-27 09:30:18 +00:00
deathride58
909be55c5f Merge pull request #6497 from Citadel-Station-13/upstream-merge-37341 
[MIRROR] Adds multilayer pipe subtypes for mapping
 2018-04-27 09:29:04 +00:00
deathride58
a44347f6e8 Merge pull request #6496 from Citadel-Station-13/upstream-merge-37365 
[MIRROR] Improves fuel tank explosion logging
 2018-04-27 09:28:16 +00:00
deathride58
e33dc09b83 Merge pull request #6495 from Citadel-Station-13/upstream-merge-37308 
[MIRROR] Desc fix
 2018-04-27 09:27:58 +00:00
deathride58
35cc70dd04 Merge pull request #6494 from Citadel-Station-13/upstream-merge-37263 
[MIRROR] 's is no longer a dirty reminder of snake lisps for the traumatized (phobia regex fix)
 2018-04-27 09:27:29 +00:00
deathride58
35e8ac1240 Merge pull request #6492 from Citadel-Station-13/upstream-merge-37364 
[MIRROR] Removes the ability for inducers and circuits to charge energy weapons.
 2018-04-27 09:21:07 +00:00
deathride58
00ef1a9f84 Merge pull request #6488 from Citadel-Station-13/upstream-merge-37362 
[MIRROR] Replaces plant/peel Crossed procs with the slippery component, where needed
 2018-04-27 09:18:15 +00:00
deathride58
c17d48affe Merge pull request #6485 from Citadel-Station-13/upstream-merge-37359 
[MIRROR] Fixes thermite immunities [s]
 2018-04-27 09:17:43 +00:00
imsxz
e2aa213a52 BADBADBADBADBADBADBADBADBADBAD (#37452) 2018-04-27 04:14:11 -05:00
ShizCalev
9e3f99092f Fixes missing augmentation hands (#37373) 2018-04-27 02:42:13 -05:00
kevinz000
8c9f4b9208 desc (#37435) 2018-04-27 02:37:44 -05:00
MrDoomBringer
18716c03a5 Analyzers show temperature in Kelvin as well as Celsius now (#37441) 
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* wew

* nicbn
 2018-04-27 02:28:21 -05:00
Armhulen
da1ac395c2 ok! (#37439) 2018-04-27 02:28:13 -05:00
KorPhaeron
ec080ab80b Paperwork Error Event (#37443) 
* Paperwork Error Event

* Condense the proc

* Properly calls set_overflow_role
 2018-04-27 00:58:24 -05:00
LetterJay
d679d27766 Merge pull request #6505 from Citadel-Station-13/upstream-merge-37378 
[MIRROR] Fixes brain tumor. Again.
 2018-04-27 00:12:14 -05:00
LetterJay
4647168c78 Merge pull request #6504 from Citadel-Station-13/upstream-merge-37379 
[MIRROR] Fixes duplicate logic causing doors to be perma stuck on shock mode.
 2018-04-27 00:11:59 -05:00
LetterJay
df90ab6fb9 Merge pull request #6503 from Citadel-Station-13/upstream-merge-37371 
[MIRROR] GetFlatIcon fix
 2018-04-27 00:11:11 -05:00
LetterJay
72ddaee4a3 Merge pull request #6502 from Citadel-Station-13/upstream-merge-37363 
[MIRROR] Makes radiation collectors buildable
 2018-04-27 00:10:52 -05:00