shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,486 Commits 5 Branches 0 Tags
cd38bccf01c586c8d997d1007803cf96cf51e7a1
Commit Graph

3675 Commits

Author SHA1 Message Date
deathride58
1d1c0a5ebb Merge pull request #6284 from Citadel-Station-13/upstream-merge-36560 
[MIRROR] [READY]AI latejoins
 2018-04-08 02:25:10 +00:00
deathride58
71344ce953 Merge pull request #6281 from Citadel-Station-13/upstream-merge-36975 
[MIRROR] Removes a sound
 2018-04-07 00:54:31 +00:00
deathride58
4739836bd9 Merge pull request #6283 from Citadel-Station-13/upstream-merge-36994 
[MIRROR] Fixes window spawner names
 2018-04-07 00:51:12 +00:00
deathride58
36c9094155 Merge pull request #6289 from Citadel-Station-13/upstream-merge-36956 
[MIRROR] Fixes trash bin wrenching message
 2018-04-07 00:49:53 +00:00
deathride58
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
deathride58
475fba9bd9 Merge pull request #6294 from Citadel-Station-13/upstream-merge-36627 
[MIRROR]  fixes #34388 by adding cam
 2018-04-07 00:46:51 +00:00
AnturK
45a8c65739 Adds kickback to mecha weapons. (#36999) 2018-04-06 14:43:11 -05:00
Tlaltecuhtli
4f7d35ec4f fixes #34388 by adding cam (#36627) 
* wip fixes #34388

🆑 
fix:stuff
🆑

* vv

* ASDASD

* daikshu

* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww

* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww

* 99999999999999999999999999999

* *tabs*

* Update comp_board_designs.dm
 2018-04-06 09:24:47 -05:00
Jordan Brown
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
Jordan Brown
4dbd06b9a2 Merge pull request #36956 from vuonojenmustaturska/anchorbin 
Fixes trash bin wrenching message
 2018-04-06 09:07:20 -05:00
kevinz000
38ae8beefc [READY]AI latejoins 2018-04-06 00:44:31 -05:00
vuonojenmustaturska
aaf3bb66cf Merge pull request #36994 from 81Denton/window-spawner-names 
Fixes window spawner names
 2018-04-06 00:44:16 -05:00
Jordan Brown
7cddf61b94 Merge pull request #36975 from KorPhaeron/sound2 
Removes a sound
 2018-04-06 00:43:56 -05:00
deathride58
a275a787c1 Merge pull request #6224 from Citadel-Station-13/upstream-merge-36815 
[MIRROR] Refactors Dance Machine + deletes a bunch of sound files
 2018-04-05 00:17:27 +00:00
deathride58
a8a7754b22 Merge pull request #6256 from Citadel-Station-13/upstream-merge-36598 
[MIRROR] Fixes bloodbath effects not working on people in crit
 2018-04-04 21:16:21 +00:00
deathride58
5f215ff2b4 Merge pull request #6257 from Citadel-Station-13/upstream-merge-36733 
[MIRROR] podpeople, wishgranter victims, and clones no longer get 0 as one of their affixes (?)
 2018-04-04 21:15:55 +00:00
deathride58
e930b98beb Update dance_machine.dm 2018-04-04 16:59:18 -04:00
John Ginnane
80fee95dab Fixed sometimes using items on full storage items (#36711) 
* Fixed sometimes using items on full storage items

* Removed redundant code and fixed spray being used on container
 2018-04-03 22:02:39 -05:00
Armhulen
fff22d5409 podpeople, wishgranter victims, and clones no longer get 0 as one of their affixes (?) (#36733) 
* yeeeeeeeeeeap

* i turned myself into a commit morty!

* I'M COMMIT RICKKKKKKKK

* tinydwarfy was an inside job

* *reels in pain* you KNOW I DON'T LIKE PISTACHIOS

* WOO
 2018-04-03 22:02:17 -05:00
kevinz000
4fb2e612df Fixes bloodbath effects not working on people in crit (#36598) 
Also some minor improvements to performance by caching the nearby mobs list once
 2018-04-03 22:01:59 -05:00
deathride58
edccb8b3e4 Merge pull request #6153 from Citadel-Station-13/upstream-merge-36442 
[MIRROR] Refactors Spell and Martial Art Books to use Action Granters!
 2018-04-03 08:16:11 +00:00
deathride58
a196e2c58e Merge pull request #6243 from Citadel-Station-13/upstream-merge-36907 
[MIRROR] Unit tests don't start until after 10s of round time
 2018-04-03 08:15:33 +00:00
deathride58
1013f3d92e Merge pull request #6245 from Citadel-Station-13/upstream-merge-36490 
[MIRROR] Archaeology...    .... Code Cleanup (One day I promise!)
 2018-04-03 08:15:12 +00:00
iksyp
496f73bc56 implant_loyality.dm has been changed to implant_mindshield.dm, better reflecting it's contents and removing a typo (#36855) 
* loyality

*fixed a bug that made coding relating to loyalty implants basically impossible

* did i say loyalty i meant mindshield

* and the .dme as well

this commit and last were webeditor but it should work
 2018-04-02 19:46:01 -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
Jordan Brown
376eee917a Unit tests don't start until after 10s of round time (#36907) 2018-04-02 14:57:18 -05:00
LetterJay
2d5874d292 Merge pull request #6238 from Citadel-Station-13/upstream-merge-36888 
[MIRROR] Removes unecessary compares in turf atmos init
 2018-04-02 09:11:59 -05:00
Jordan Brown
16896254cf Merge pull request #36888 from Robustin/initatmos 
Removes unecessary compares in turf atmos init
 2018-04-02 08:33:48 -05:00
Jordan Brown
5142076ea7 Merge pull request #36901 from KorPhaeron/beeper 
Fixes morgue beeper message
 2018-04-02 08:32:33 -05:00
LetterJay
9045de2c90 Merge pull request #6204 from Citadel-Station-13/upstream-merge-36873 
[MIRROR] Comms console fix - no more refreshing every 2 seconds while trying to purchase a shuttle.
 2018-04-02 05:41:19 -05:00
LetterJay
e4c6ce0a98 Update dance_machine.dm 2018-04-01 19:53:15 -05:00
LetterJay
a9c91b4d00 Merge pull request #6127 from Citadel-Station-13/upstream-merge-36689 
[MIRROR] Hotfix for #36688 - Excludes non-carbon-based life from the disco machine's dance4 proc to fix pAI "resting/getting up" chat spam
 2018-04-01 19:51:58 -05:00
LetterJay
022ac2e6c3 Merge pull request #6178 from Citadel-Station-13/shit 
sanity
 2018-04-01 19:51:39 -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
f7be23e78a Merge branch 'master' into upstream-merge-36442 2018-04-01 19:50:37 -05:00
LetterJay
31bb211cb3 Update communications.dm 2018-04-01 19:48:15 -05:00
LetterJay
661f8b3468 Merge pull request #6217 from Citadel-Station-13/upstream-merge-36851 
[MIRROR] Adds singular_name to BS polycrystals
 2018-04-01 17:47:37 -05:00
fludd12
7826515aed Walls made entirely of wood! (#36524) 
* Buffs Lifebringers (And kind of botany.)

* Retools staff to use earthsblood as fuel, can now remove rock walls

* No more blessings!

* Dismantle the means of production.
 2018-04-01 12:24:33 -05:00
KorPhaeron
01ff7cf8da Refactors Dance Machine + deletes a bunch of sound files 2018-04-01 09:42:14 -05:00
vuonojenmustaturska
76a9540f80 Merge pull request #36851 from 81Denton/bs-polycrystal-name 
Adds singular_name to BS polycrystals
 2018-04-01 07:27:45 -05:00
LetterJay
bd28b80a10 Merge pull request #6182 from Citadel-Station-13/upstream-merge-36838 
[MIRROR] AIFixer no longer updates overlays on every process()
 2018-04-01 01:03:33 -05:00
LetterJay
c19f285322 Merge pull request #6179 from Citadel-Station-13/upstream-merge-36807 
[MIRROR] Fixes some edge cases with chameleon projectors and sleepers
 2018-04-01 01:03:10 -05:00
LetterJay
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
oranges
6e57afd034 Comms console fix - no more refreshing every 2 seconds while trying to purchase a shuttle. 2018-03-31 18:27:17 -05:00
LetterJay
78bc5ed7ef Merge pull request #6173 from Citadel-Station-13/upstream-merge-36772 
[MIRROR] Removes derpartment
 2018-03-31 06:22:11 -05:00
LetterJay
05e85ddfb0 Merge pull request #6168 from Citadel-Station-13/upstream-merge-36625 
[MIRROR] Fixes blueprints exploit
 2018-03-31 06:21:14 -05:00
LetterJay
e35ddc7093 Merge pull request #6157 from Citadel-Station-13/upstream-merge-36723 
[MIRROR] Corrects plasma window armor inconsistency
 2018-03-31 06:18:48 -05:00
LetterJay
71af2a9bc5 Merge pull request #6154 from Citadel-Station-13/upstream-merge-36477 
[MIRROR] Science goggles detect grenade reagents
 2018-03-31 06:17:37 -05:00
LetterJay
d509014cd3 Merge pull request #6151 from Citadel-Station-13/upstream-merge-36655 
[MIRROR] Fixes hot potato coloration
 2018-03-31 06:17:22 -05:00
LetterJay
9cf0b857db Merge pull request #6150 from Citadel-Station-13/upstream-merge-36617 
[MIRROR] Improves some logging legibility
 2018-03-31 06:17:11 -05:00