shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,199 Commits 5 Branches 0 Tags
87dee7ff8310cc40e1bf0fc2dee7c814eafa288a
Commit Graph

19199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJay
87dee7ff83 mime overalls - donator 2019-01-05 11:01:21 -06:00
nik707
17a9099faa Merge pull request #7891 from Citadel-Station-13/kevinz000-patch-8 
speedmerged cus important fix
 2019-01-04 03:10:49 -06:00
kevinz000
302f8f00f4 Update tomato.dm 2019-01-04 00:42:29 -08:00
Lasshy KorshBot
e6b9c9c441 Adds a squeak emote (#7871) 
* Adds a squeak emote

Adds a cute squeak for insects

* Update cit_emotes.dm

* tabbed up last line, changed emote message.

* Changed spaces from tabs, fixed compiling issues

I don't know why they were spaces, should fix Compiling issues

* Fixed tab stuff AGAIN

Compiling should work now??

* Made audio file louder

It was too quiet

* Delete mothsqueak.ogg

* Fixed the audio on the .ogg

was too quiet

* Fixed / at the end and removed if human

* fixed indentation stuff again again
 2019-01-03 08:40:43 -08:00
deathride58
4c904ee5e6 Merge pull request #7846 from Citadel-Station-13/sdql2 
SDQL2 upgrades!
 2019-01-03 08:00:15 -05:00
deathride58
9ee2d94ab2 Merge pull request #7831 from Citadel-Station-13/ball_stuff 
[No this is not just for testmerge]Adds the required assets for the ball map
 2019-01-03 08:00:03 -05:00
deathride58
ec6f9fabb4 Merge pull request #7843 from Citadel-Station-13/kevinz000-patch-1 
Bandaids around a river infinite loop
 2019-01-03 07:51:14 -05:00
deathride58
39a1e05b80 Merge pull request #7844 from Citadel-Station-13/kevinz000-patch-2 
Fixes who sorting, removes admin advanced who from non-adminghosted admins
 2019-01-03 07:49:11 -05:00
deathride58
2d01ac3604 Merge pull request #7868 from Citadel-Station-13/kevinz000-patch-4 
fixes neurotoxin properly
 2019-01-03 07:47:34 -05:00
deathride58
1cd455b3b5 Merge pull request #7869 from Citadel-Station-13/kevinz000-patch-5 
fixes xenotackle properly take 2
 2019-01-03 07:47:02 -05:00
deathride58
52ac9dd5c8 Merge pull request #7872 from Citadel-Station-13/kevinz000-patch-7 
fixes a pretty bad balance issue with tesla coils
 2019-01-03 07:46:39 -05:00
deathride58
c3262dfdf2 Merge pull request #7874 from Citadel-Station-13/kevinz000-patch-8 
Ninja event now respects the "only fire once" thing.
 2019-01-03 07:45:47 -05:00
deathride58
aa1cbb0841 Merge pull request #7875 from Citadel-Station-13/kevinz000-patch-9 
Devil event now respects the "only fire once" thing. (webeditor pr yo)
 2019-01-03 07:45:26 -05:00
Trilbyspaceclone
a2ba37d664 Update all_nodes.dm (#7864) 2019-01-03 04:44:00 -08:00
Trilbyspaceclone
c50ca750d8 [Ready] Makes the YouTools and Vendomat more useful (#7870) 
* Fixing updater

* Update youtool.dm

* Update assist.dm
 2019-01-03 04:39:14 -08:00
Trilbyspaceclone
21f111b5e0 [Ready] New mech weapon, Melon Seed Scatter shot! - Requested and helped made by Elllsiy (#7873) 
* Fixing updater

* Adds the gunthingy

* makes the bullet

* Update mecha_designs.dm

* Update all_nodes.dm

* Fixes stam harm
 2019-01-03 04:38:10 -08:00
Trilbyspaceclone
09df2edf25 Update uplink_items.dm (#7877) 2019-01-03 04:36:52 -08:00
CitadelStationBot
5c8d548465 Automatic changelog generation for PR #7876 [ci skip] 2019-01-03 06:35:47 -06:00
deathride58
6c8e0a67ad Ports tgstation/tgstation#42035 - Notifies admins when Lone Op event chance is changed (#7876) 
* makes the nuke disk notify admins when the loneop event weight chance increases/decreases

* oh and the logging too

* fucking spaces sneaking into my ctrl+c > ctrl+v
 2019-01-03 04:35:45 -08:00
CitadelStationBot
2a3fb66410 Automatic changelog generation for PR #7866 [ci skip] 2019-01-03 06:35:19 -06:00
deathride58
fd5908c081 Makes it possible to instantly get on your feet at the cost of 20 buffered stamina (#7866) 2019-01-03 04:35:17 -08:00
CitadelStationBot
b6488cb819 Automatic changelog generation for PR #7878 [ci skip] 2019-01-03 06:34:57 -06:00
Tupinambis
58347dad9b Stop self antagging you shits (#7878) 2019-01-03 04:34:55 -08:00
nik707
7ed0303a3b Merge pull request #7880 from Trilbyspaceclone/revert-7862-fan 
[Ready] Fixes "Adds fans to each white ship hopefully at all doors leading to space! - Requested by Seras/Others"
 2019-01-02 02:20:59 -06:00
Trilbyspaceclone
9618fecfb7 Correct fans 2019-01-02 02:40:10 -05:00
Trilbyspaceclone
0b556a46af correct fans 2019-01-02 02:39:19 -05:00
Trilbyspaceclone
fc5b9117f2 Correct fans 2019-01-02 02:35:23 -05:00
Trilbyspaceclone
02761a38c9 Correct fans 2019-01-02 02:29:53 -05:00
Trilbyspaceclone
de551bc0c6 Revert "Adds fans to each white ship hopefully at all doors leading to space! - Requested by Seras/Others (#7862)" 
This reverts commit addea6f21c.
 2019-01-02 02:21:23 -05:00
Trilbyspaceclone
3f7754e7f0 Revert "Adds two boxes of candles to DEEP (#7851)" 
This reverts commit f2ae556ee4.
 2019-01-02 02:21:23 -05:00
Trilbyspaceclone
3cc8c1cc07 Revert "[Ready] Cargo packets with RLD RCD and IRCD! (#7840)" 
This reverts commit cbae32f82d.
 2019-01-02 02:21:23 -05:00
Trilbyspaceclone
1ceff601be Revert "Makes stamcrit completely unaffected by health (#7865)" 
This reverts commit f2126c6d9e.
 2019-01-02 02:21:23 -05:00
Trilbyspaceclone
8f0d23d081 Revert "Automatic changelog generation for PR #7865 [ci skip]" 
This reverts commit 35a914778d.
 2019-01-02 02:21:23 -05:00
Trilbyspaceclone
c882d10404 Revert "[Ready] Buffs RPEDs (#7853)" 
This reverts commit be568777d2.
 2019-01-02 02:21:23 -05:00
Trilbyspaceclone
db7061bb7e Revert "QM is a head (#7855)" 
This reverts commit df2090a087.
 2019-01-02 02:21:23 -05:00
Trilbyspaceclone
faf86ce131 Revert "[Ready] Adds in a scatter shot Bulldog drum! (#7863)" 
This reverts commit 1f1c5b3710.
 2019-01-02 02:21:23 -05:00
kevinz000
ba24207f86 Update devil.dm 2019-01-01 00:06:13 -08:00
kevinz000
c620beec65 Update ninja_event.dm 2019-01-01 00:05:53 -08:00
kevinz000
f140d56b43 Update coil.dm 2018-12-31 23:41:01 -08:00
Trilbyspaceclone
1f1c5b3710 [Ready] Adds in a scatter shot Bulldog drum! (#7863) 
* Fixing updater

* adds the ammo

* Update uplink_items.dm

* Update shotgun.dm

* Update uplink_items.dm
 2018-12-31 03:11:44 -08:00
Trilbyspaceclone
df2090a087 QM is a head (#7855) 2018-12-31 03:11:10 -08:00
Trilbyspaceclone
be568777d2 [Ready] Buffs RPEDs (#7853) 
* Buffs RPEDs

* maybe
 2018-12-31 03:10:47 -08:00
CitadelStationBot
35a914778d Automatic changelog generation for PR #7865 [ci skip] 2018-12-31 05:07:48 -06:00
deathride58
f2126c6d9e Makes stamcrit completely unaffected by health (#7865) 
* makes stamina completely unaffected by health

* oh, and these lines too
 2018-12-31 03:07:46 -08:00
Trilbyspaceclone
cbae32f82d [Ready] Cargo packets with RLD RCD and IRCD! (#7840) 
* *oh no*

* I know I know

* Update packs.dm

* Last touches

* "Not that op"

* Update packs.dm

* makes the IRCD

* Update packs.dm
 2018-12-31 03:07:20 -08:00
Trilbyspaceclone
f2ae556ee4 Adds two boxes of candles to DEEP (#7851) 2018-12-31 03:06:50 -08:00
Trilbyspaceclone
addea6f21c Adds fans to each white ship hopefully at all doors leading to space! - Requested by Seras/Others (#7862) 
* Fixing updater

* Adds fans

* Adds fan

* Update whiteship_meta.dmm

* Update whiteship_delta.dmm
 2018-12-31 03:05:39 -08:00
kevinz000
8bada7f961 Update human_defense.dm 2018-12-30 22:23:13 -08:00
kevinz000
5c3eb5b00e Update neurotoxin.dm 2018-12-30 22:22:45 -08:00
LetterJay
60a9d7da90 Merge pull request #7859 from Citadel-Station-13/fixesmaster 
FIXES MASTER
 2018-12-29 07:07:10 -06:00