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

19134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
LetterJay
60a9d7da90 Merge pull request #7859 from Citadel-Station-13/fixesmaster 
FIXES MASTER
 2018-12-29 07:07:10 -06:00
deathride58
a73d43a664 FIXES MASTER 2018-12-28 19:48:12 -05:00
deathride58
6c6f19c332 Merge pull request #7857 from Citadel-Station-13/donator_duo 
Adds two donation items
 2018-12-28 13:12:35 -05:00
LetterJay
1db9e44f5b Adds two donation items 2018-12-28 10:09:42 -06:00
nik707
6fbf3e07fe Merge pull request #7845 from Trilbyspaceclone/patch-30 
Makes Bio suits = to Rad suits.
 2018-12-25 02:23:46 -06:00
nik707
0fff94b4f7 Merge pull request #7847 from Citadel-Station-13/kevinz000-patch-3-1 
fix xenos 2
 2018-12-25 02:22:11 -06:00
nik707
35aa48e903 Merge pull request #7848 from Citadel-Station-13/kevinz000-patch-3 
fix xenos 1
2 hours early sue me
 2018-12-25 02:22:00 -06:00
kevinz000
0d78a109f6 Update human_defense.dm 2018-12-24 01:52:24 -08:00
kevinz000
96b4171044 Update neurotoxin.dm 2018-12-24 01:52:08 -08:00
Trilbyspaceclone
687bbb1397 makes them = 2018-12-22 11:36:20 -05:00
Trilbyspaceclone
451dd8948a Update bio.dm 2018-12-22 11:22:48 -05:00
BlackMajor
f50b839c25 Wizard objectives are shit and nobody follows them anyway. (#7835) 
* Update wizard.dm

* Update wizard.dm

* Update wizard.dm
 2018-12-20 01:04:51 -08:00
deathride58
bf818c2be5 Merge pull request #7827 from Tupinambis/AshWalkerV2 
The improved Ash Walker Experience (Hisser Approved)
 2018-12-20 03:34:23 -05:00
deathride58
1756a0e59f Merge pull request #7830 from Poojawa/patch-2 
Re adds missed QOL with posibrain sounds
 2018-12-20 03:25:25 -05:00
deathride58
3fcedd08e9 Merge pull request #7798 from Citadel-Station-13/kevinz000-patch-18 
nerfs family heirloom to not work on things above or at 18 deflection and not work on items
 2018-12-20 03:24:47 -05:00
deathride58
7cd593b350 Merge pull request #7819 from Trilbyspaceclone/patch-25 
[Ready] Adds magboots to UV Engi units
 2018-12-20 03:22:38 -05:00
deathride58
fe92f9106b Merge pull request #7833 from Citadel-Station-13/exemption 
JEXP Exemption now exempts from account age locks too
 2018-12-20 03:15:11 -05:00
deathride58
6017b844fc Merge pull request #7836 from Poojawa/muhsnowflake 
Fixes Star Trek Hats and coats
 2018-12-20 03:14:53 -05:00
Trilbyspaceclone
a47426ef48 Makes pinapple pizza eatable (#7821) 
>Not just removing it
 2018-12-18 21:25:40 -08:00
kevinz000
b079a5e8df Update toolbox.dm 2018-12-18 18:06:04 -08:00
nik707
912a18ded8 Merge pull request #7838 from Ignari-Coldstorm/patch-1 
Fixes duplicate medipen.
 2018-12-17 20:50:29 -06:00
Ignari-Coldstorm
aa57d42d6c Fixes duplicate medipen. 
Fixes a duplicate medipen showing up in vendor list.
 2018-12-17 20:28:04 -06:00
Poojawa
c6f11fdf77 Fixes star trek memes 2018-12-17 08:41:59 -06:00
kevinz000
8812ef9ddd exemption 2018-12-16 11:05:26 -08:00
Ignari-Coldstorm
9c16527cd4 Mining Vendor and PPKA changes! (#7817) 
* Mining Vendor and PPKA changes!

Adjusted the prices on a couple items as well as added in the pocket extinguisher to the vendor. Adjusted the Premium Proto-Kinetic Accelerator to have one less range.

* Update machine_vending.dm
 2018-12-16 03:56:21 -08:00
Poojawa
44acfd9858 Re adds missed QOL with posibrain sounds 
christ
 2018-12-16 01:25:37 -06:00
Tupinambis
828b631570 Increased Ash Walker resistances, makes them ash proof. Improves the Base. 2018-12-15 15:33:19 -06:00
nik707
f9b257c2c6 Merge pull request #7809 from Citadel-Station-13/kevinz000-patch-17-1 
While we're at it let's remove beepsky hating on furries too
 2018-12-15 15:20:35 -06:00
nik707
90855b2aea Merge pull request #7812 from Citadel-Station-13/kevinz000-patch-19 
Nerfs banana spiders. Banana spiders however actually work now.
 2018-12-15 15:19:39 -06:00
nik707
5eaeb6b928 Merge pull request #7824 from Citadel-Station-13/kevinz000-patch-23 
new players no longer see aooc
 2018-12-15 15:17:05 -06:00
nik707
a88434f69e Merge pull request #7823 from Ragolution/master 
Adjusts Egg Nog to be more immersive (and just in time for the Winter Ball)
 2018-12-15 15:16:26 -06:00
Ragolution
ff8a2337ca Removes outfitting cost 
Removes loadout cost from sweaters because they're just sweaters.
 2018-12-15 16:02:51 -05:00
Ragolution
01c589f172 5th Port Sweater Adjustments 
Puts 5th port sweaters into the correct category and file.

Fixes sweaters not spawning.
 2018-12-15 06:38:32 -05:00
nik707
2852daa27d Merge pull request #7815 from Trilbyspaceclone/Reece 
New admin buttens for Reece
 2018-12-14 21:05:13 -06:00
kevinz000
941d5fcfba Update aooc.dm 2018-12-14 01:34:39 -08:00
Ragolution
2b97d32dd2 Improves Eggnog 
Changes icon state to new icon, rather than standard glass of yellow juice. Also adds flavorful description.
 2018-12-14 01:49:05 -05:00
Ragolution
517a6d71ef Revert "Update drinks.dm" 
This reverts commit f76d93a368.
 2018-12-14 01:45:39 -05:00
Ragolution
8dd8fb4167 Update drinks.dmi 
Adds new icon for glass of eggnog as state nog3
 2018-12-14 01:41:45 -05:00
Ragolution
f76d93a368 Update drinks.dm 
* Changes flavor text to reflect status as not a carton.
 2018-12-14 01:26:34 -05:00
Trilbyspaceclone
9961d0e321 More heirlooms! Also changes Mime/Clown's (#7793) 
* More heirlooms

* Update negative.dm

WIP

* makes the knife

* dusty

* Makes everone happy

* grammer
 2018-12-13 11:52:48 -08:00
Trilbyspaceclone
3b24774714 Buffs NanoMed Wall units! (#7794) 
* removes some rouge things

* Kev wishes
 2018-12-13 11:51:55 -08:00
Trilbyspaceclone
33b16bbf71 Update Sleeper.dm (#7797) 2018-12-13 11:50:30 -08:00
Trilbyspaceclone
c9c8207c6c Makes Bubble Gum a male - Requested by LeglessLizard (#7820) 
* Makes Bubble Gum a male

* var*

* >uses a unused var
 2018-12-13 11:49:39 -08:00
deathride58
fc3cca6a19 lets try to fix heat not spreading - makes hotspot_expose force turf air updates (#7814) 2018-12-13 11:48:57 -08:00
Trilbyspaceclone
415c1de16d adds magboots 2018-12-13 11:13:11 -05:00
nik707
f3e783713d Merge pull request #7813 from deathride58/toohardfortg 
Makes sparks, welding tools, etc, ignite plasma a lot easier
 2018-12-12 18:26:31 -06:00
deathride58
11402e5337 this shit is much too hard for tg to handle - makes hotspot_expose ignite plasma and tritium a lot easier 2018-12-11 16:22:47 -05:00