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

7285 Commits

Author SHA1 Message Date
Poojawa
eb623ebdd6 Pretty late join menu memes (#7978) 
* initial things, need to clean up bhjin snowflake

* idk how to fix it

Links work, but it doesn't play nice with the loop.

* Update new_player.dm

don't actually need job_count, tbh I think

* working as intended

* deletes brazil
 2019-02-05 17:57:26 -08:00
Tupinambis
e5e97302d4 Adds a new security level: Amber (#7976) 
* Adds the Amber security level.

* This isn't C
 2019-02-05 17:53:58 -08:00
BlackMajor
eb0d9ba63b Adds the plushtide. (#7972) 
* Plushtide is now

Adds plushies, puts them in arcades and cargo crates. Adjusts cargo crate cost to 1500.

* Small adjustments

Sounds were too quiet, robot misnamed

* Small typo fix

scruppuppy -> scrubpuppy
 2019-02-04 00:28:47 -08:00
Trilbyspaceclone
dab1591bca Update drinks_recipes.dm (#7962) 2019-01-27 00:35:43 -08:00
Trilbyspaceclone
b8043dc807 [Ready] Buffs Cayenne the carp (#7956) 
* buffs Cayenne the carp

* woops >_<
 2019-01-27 00:34:56 -08:00
deathride58
31af02d4e6 makes flashes more effective as a utility item rather than a weapon (#7911) 2019-01-27 00:32:40 -08:00
deathride58
fa1693a291 adds the player's character name to the new player panel so that people quit joining in as the wrong character (#7908) 2019-01-27 00:32:13 -08:00
nik707
55b622c148 Merge pull request #7961 from Citadel-Station-13/kevinz000-patch-5 
tgs3 sdql2 command is slightly more useful but still pretty damn useless
 2019-01-26 23:45:46 -06:00
kiwedespars
a876e985e7 adds bwoink and snap to vog 
this isn't needed
adds heyo to orgasm words too.

however, man once thought of something really stupid, and man's contributor didn't want to do it, so man made it happen
 2019-01-24 18:41:42 -08:00
kevinz000
beab8047b9 Update chat_commands.dm 2019-01-23 23:59:07 -08:00
deathride58
b9d5beeefd Merge pull request #7932 from Trilbyspaceclone/racec 
[Ready] Adds the abilty to make 3 lesser race tonics
 2019-01-21 19:47:48 -05:00
deathride58
6719cf4b52 Merge pull request #7924 from Trilbyspaceclone/paperwork 
[Ready] Makes paper work for cargo to do for spare credits!
 2019-01-21 19:46:58 -05:00
deathride58
2cd500de04 Merge pull request #7925 from Citadel-Station-13/kevinz000-patch-15 
Radioactive Teleport Armor - Everyone Dies Edition
 2019-01-21 19:45:51 -05:00
Trilbyspaceclone
da7dbe6204 Update packs.dm 2019-01-20 17:34:15 -05:00
deathride58
2b852a4dec Update code/modules/crafting/recipes.dm 
Finnnnneeeee

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2019-01-20 17:32:56 -05:00
deathride58
08601b75f6 Merge pull request #7939 from Citadel-Station-13/kevinz000-patch-5 
Disables crayon powder coloring mobs
 2019-01-20 02:46:56 -05:00
BlackMajor
454f672e34 Why isn't the compact shotgun compact 
-Changes the wardens compact combat shotgun to fit in backpacks.

No really, a sawed off riot shotgun fits in a backpack and holds more ammo. Any Warden worth their salt just swaps shotguns, you'd think a "Compact" shotgun would be able to fit much the same considering the lower ammo count.
 2019-01-16 19:54:58 +13:00
kevinz000
93acbf0a1d Update other_reagents.dm 2019-01-15 19:51:08 -08:00
nik707
4c8b2cfd7b Merge pull request #7922 from deathride58/fixesmajorgamebreakingbug 
fixes a very major bug that makes the game extremely unplayable
 2019-01-14 22:24:22 -06:00
nik707
62b177ea7c Merge pull request #7919 from deathride58/animatedthrows 
fancy throws - makes throws perform the attack animation and play a sound
 2019-01-14 22:21:43 -06:00
nik707
a01f949623 Merge pull request #7921 from deathride58/fancierdisposalnoises 
Immersive disposals - Things in disposals will now make sounds when hitting corners
 2019-01-14 22:21:03 -06:00
deathride58
579a729a02 Merge pull request #7930 from Citadel-Station-13/nik707-patch-1 
Completely tested and working TEG nerf
 2019-01-14 22:09:43 -05:00
deathride58
282dabc498 Merge pull request #7928 from Citadel-Station-13/kevinz000-patch-19 
Fixes an edge case regarding mind initialization firing while being gibbed by an explosion
 2019-01-14 22:04:02 -05:00
deathride58
0a8e288ae0 Merge pull request #7914 from Ghommie/Ghommie-cit1 
Minor reagent_containers clean up on hydroitemdefines.dm
 2019-01-14 21:52:02 -05:00
deathride58
dab87b1b43 Merge pull request #7909 from Trilbyspaceclone/patch-46 
[Ready] Makes engivender more usefull and adds a few more coin items
 2019-01-14 21:48:50 -05:00
deathride58
a877e796d4 Merge pull request #7890 from Ragolution/endrapen 
Suicide Messages, Combat Messages, Uniforms Recovered
 2019-01-14 21:39:02 -05:00
deathride58
5ebc570c7a Merge pull request #7888 from Citadel-Station-13/kevinz000-patch-5 
Reworks ephedrine
 2019-01-14 21:37:45 -05:00
deathride58
9047538620 Merge pull request #7884 from Citadel-Station-13/kevinz000-patch-13 
Readds drones
 2019-01-14 21:36:37 -05:00
Trilbyspaceclone
910c79efdf sure thing 2019-01-13 13:27:14 -05:00
Trilbyspaceclone
d4b6da5d6e Update others.dm 2019-01-13 12:16:25 -05:00
nik707
f5382b4ff6 absolutely tested 2019-01-13 02:04:46 -06:00
Trilbyspaceclone
913de53760 Update engivend.dm 2019-01-13 01:42:11 -05:00
Trilbyspaceclone
6d9c76ce3a Update engivend.dm 2019-01-13 01:31:20 -05:00
kevinz000
e485dfc812 Update brain.dm 2019-01-12 17:02:58 -08:00
Ragolution
6ba56c7331 Apply suggestions from code reviewer Rag 
Spell checker

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2019-01-12 15:06:38 -05:00
kevinz000
a37684aae2 Update reactive_armour.dm 2019-01-12 10:47:35 -08:00
kevinz000
ac87048678 Update reactive_armour.dm 2019-01-12 10:45:52 -08:00
kevinz000
fc090a462e Update reactive_armour.dm 2019-01-12 10:45:00 -08:00
kevinz000
feeea1ab8c Update reactive_armour.dm 2019-01-12 10:40:16 -08:00
deathride58
50305c70fd Merge pull request #7915 from Citadel-Station-13/kevinz000-patch-19 
Adds some rogue vendor lines that may or may not be referencing how certain people talk in discord.
 2019-01-12 01:18:38 -05:00
deathride58
52c1e483f5 Merge pull request #7901 from Trilbyspaceclone/patch-43 
[Ready] Moves RCLD to a proper place - Requested by Kevs
 2019-01-12 01:13:04 -05:00
Trilbyspaceclone
ba3826af5d Update recipes.dm 2019-01-11 18:23:31 -05:00
Trilbyspaceclone
1e425c7e40 Update packs.dm 2019-01-11 18:17:47 -05:00
Trilbyspaceclone
165967416e Update manifest.dm 2019-01-11 18:07:39 -05:00
Trilbyspaceclone
9a6d395197 Update order.dm 2019-01-11 18:06:12 -05:00
Trilbyspaceclone
2a0a57dcd2 Update manifest.dm 2019-01-11 17:56:57 -05:00
deathride58
2fa89d71b3 FIXES A BUG THAT MAKES THE GAME EXTREMELY UNPLAYABLE 2019-01-11 11:40:46 -05:00
deathride58
0f48e77990 makes the sound actually play at the right place 2019-01-11 04:58:11 -05:00
deathride58
37d90a780a all items in disposal pipes now make small sounds when they hit corners. all mobs will make very audible sounds when they hit corners 2019-01-11 04:27:53 -05:00
deathride58
e03cd1e405 fancy throws - makes throws perform the attack animation and play a sound 2019-01-11 02:52:15 -05:00