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

7171 Commits

Author SHA1 Message Date
kevinz000
8bada7f961 Update human_defense.dm 2018-12-30 22:23:13 -08: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
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
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
Trilbyspaceclone
a47426ef48 Makes pinapple pizza eatable (#7821) 
>Not just removing it
 2018-12-18 21:25:40 -08:00
Ignari-Coldstorm
aa57d42d6c Fixes duplicate medipen. 
Fixes a duplicate medipen showing up in vendor list.
 2018-12-17 20:28:04 -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
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
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
f76d93a368 Update drinks.dm 
* Changes flavor text to reflect status as not a carton.
 2018-12-14 01:26:34 -05:00
Trilbyspaceclone
3b24774714 Buffs NanoMed Wall units! (#7794) 
* removes some rouge things

* Kev wishes
 2018-12-13 11:51:55 -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
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
kevinz000
552a9622c7 Update human.dm 2018-12-11 01:09:03 -08:00
deathride58
abdf3b2cd9 Merge pull request #7800 from Citadel-Station-13/kevinz000-patch-19 
xeno tackles now hardstun for 3 seconds if someone is not lying down
 2018-12-10 19:26:58 -05:00
deathride58
87f10ae5c5 Merge pull request #7801 from Citadel-Station-13/kevinz000-patch-20 
xenomorph neurotoxin now always hard stuns for 3 seconds, and do 25 stamina because honestly the stamina rework destroyed a major antagonist and it is sad
 2018-12-10 19:25:52 -05:00
nik707
f4c022d076 Merge pull request #7795 from Trilbyspaceclone/patch-21 
Syndicate bombs (The drink) can now spawn in snack vests
 2018-12-10 16:55:06 -06:00
nik707
cae30f90ad Merge pull request #7799 from R3dtail/new_carpet 
Added Another new carpet, and two tables, a new cargo crate, and two new medals.
 2018-12-10 16:45:38 -06:00
nik707
1960947d25 Merge pull request #7803 from Trilbyspaceclone/patch-23 
Adds in white crayons to art crate.
 2018-12-10 16:44:25 -06:00
Trilbyspaceclone
170a843288 recheck 2018-12-09 19:20:02 -05:00
Trilbyspaceclone
63ad6f1175 Update vent_clog.dm 2018-12-09 15:15:23 -05:00
Trilbyspaceclone
3e736dcdf2 adds in white crayons 2018-12-08 17:19:13 -05:00
Redtail
4c7075f1a8 New medals added. 
add:  Two new medals for engineering and medical to give out.
 2018-12-08 12:12:36 -06:00
kevinz000
d049ecaecd Update hydroitemdefines.dm 2018-12-08 04:53:02 -08:00
kevinz000
a347cd14e2 eh 2018-12-08 04:19:41 -08:00
kevinz000
7978daa370 oopsies woopsies i made a fucky wucky 2018-12-08 04:18:57 -08:00
kevinz000
a2f9135951 Update hydroitemdefines.dm 2018-12-08 04:16:04 -08:00
kevinz000
6ba2d56435 Update neurotoxin.dm 2018-12-08 04:14:36 -08:00
kevinz000
f250d6ef94 Update human_defense.dm 2018-12-08 04:13:16 -08:00
Redtail
629189fdc1 Added Another new carpet, and two tables, and a new cargo crate. 
Added:  monochrome.  Two new table sprites for the other new carpet.  New cargo supply crate for the two new carpets.  Changed:   the name of the new carpet to "blackred" so it would avoid confusion with the original carpet.
 2018-12-07 22:48:46 -06:00
Trilbyspaceclone
c9a4a08183 Merge pull request #4 from Trilbyspaceclone/lol 
Makes the glass
 2018-12-06 19:27:15 -05:00
Trilbyspaceclone
4ad2b4d070 Makes the glass 2018-12-06 19:26:37 -05:00
Trilbyspaceclone
17b5a6061a Cargo Hardsuit Packets as well as a pare of soft suits (DPO) (#7767) 
* Hardsuits and a set of softs

* Ups sec suit to 3000 do to it being a sec suit

* DropPodOnly!

* Woops

* Kev wishes
 2018-12-04 18:14:04 -08:00
deathride58
6ec059ecfa Merge pull request #7784 from nik707/buildmode 
Fixes buildmode, probably.
 2018-12-04 00:29:02 -05:00