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

19393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trilbyspaceclone cf4c5bc7e5 Update snacks_other.dm (#7971) 2019-02-05 18:14:23 -08:00
Trilbyspaceclone 32e0d08c1d Adds a ton of new clown names (#7970) 2019-02-05 18:13:54 -08:00
Trilbyspaceclone 660703e713 [Ready] Fixes price of Paperwork and makes the not have 2 spare pens (#7969) 
* Update manifest.dm

* Blacklists

* Removes cardboard

* Forgot the comma

* : /
 2019-02-05 18:13:26 -08:00
Trilbyspaceclone 1eff3dcdb5 [Ready] Gives large compressed matter its own name and desc, Also ports Tg #41256 (#7953) 
* Update RCD.dm

* Ports Tg#41256

* .
 2019-02-05 18:11:18 -08:00
Trilbyspaceclone 7b0f9de138 [Ready] More useful tips. (#7957) 
* Usefull tips

* Update tips.txt

* Update tips.txt

* distance

* Apply suggestions from code review

Rags helpings

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Half way with rag
 2019-02-05 18:10:53 -08:00
Trilbyspaceclone b27ab885f3 [Ready] Adds new huds that help correct vision. (#7943) 
* Fixing updater

* Adds the things

* Update all_nodes.dm

* Update misc_designs.dm

* Update hud.dm

* Update engine_goggles.dm

* Update _glasses.dm

* Update hud.dm

* Update packs.dm

* Update misc_designs.dm

* Update packs.dm

* Update hud.dm

* Update all_nodes.dm

* Update all_nodes.dm

* Update hud.dm

* Update misc_designs.dm
 2019-02-05 18:09:34 -08:00
Zargul a201c29697 Fixing Star Trek DS9 uniforms (#7968) 
Fixing the the mix-up of the DS9 uniforms. Command is now red, gold is now ops/security.
 2019-02-05 18:08:13 -08:00
CitadelStationBot 8923ae9b3c Automatic changelog generation for PR #7951 [ci skip] 2019-02-05 20:05:36 -06:00
Ghom 0449325212 Fixes invisible limb sprites. (#7951) 
* F

* FF

* FFF
 2019-02-05 18:05:34 -08:00
CitadelStationBot 9030011d0a Automatic changelog generation for PR #7978 [ci skip] 2019-02-05 19:57:28 -06:00
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
CitadelStationBot 5758a4f2c9 Automatic changelog generation for PR #7976 [ci skip] 2019-02-05 19:54:01 -06: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 fa34212e60 [Ready] Fixes mute trait (#7959) 
* Fuck it lets not have the trait broken

* Update negative.dm

* Update negative.dm

* Update negative.dm
 2019-01-27 00:35:16 -08:00
Trilbyspaceclone b8043dc807 [Ready] Buffs Cayenne the carp (#7956) 
* buffs Cayenne the carp

* woops >_<
 2019-01-27 00:34:56 -08:00
Trilbyspaceclone 14b873c9aa [Ready] Fixes power tool drill fitting in boots/wallet (#7958) 
* Update wallets.dm

* Makes sure boots cant do it
 2019-01-27 00:34:36 -08:00
CitadelStationBot 96df41d76d Automatic changelog generation for PR #7954 [ci skip] 2019-01-27 02:32:52 -06:00
deathride58 5b43a2dba3 Janitor powercreep - buffs mops by axing the delay on their cleaning (#7954) 
* janitor powercreep - heavily buffs mops

* nerfs mops by making them use up stamina. standard mop takes 5 stamina per tile mopped, advanced mop takes 2 stamina

* fixes travis
 2019-01-27 00:32:50 -08:00
CitadelStationBot 1e6f497772 Automatic changelog generation for PR #7911 [ci skip] 2019-01-27 02:32:42 -06:00
deathride58 31af02d4e6 makes flashes more effective as a utility item rather than a weapon (#7911) 2019-01-27 00:32:40 -08:00
CitadelStationBot 131fc926b3 Automatic changelog generation for PR #7908 [ci skip] 2019-01-27 02:32:14 -06: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
deathride58 8e48dc5456 moves twilightic's donor item to the neck category in the loadout menu (#7937) 2019-01-27 00:31:29 -08:00
deathride58 4c0d5786d9 Merge pull request #7967 from Citadel-Station-13/kevinz000-patch-15 
bandaid fix for bug
 2019-01-27 03:27:11 -05:00
kevinz000 67d9dd4a82 Update effect_system.dm 2019-01-27 00:09:24 -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
nik707 b7ab4a5bb6 Merge pull request #7963 from kiwedespars/master 
adds bwoinking and snapping to vog.
 2019-01-26 23:45:21 -06:00
CitadelStationBot 2759cc2109 Automatic changelog generation for PR #7964 [ci skip] 2019-01-25 23:05:25 -06:00
deathride58 a81474a786 Merge pull request #7964 from CydiaButt13/lampstuff 
Adds a Lamp Plushie
 2019-01-26 00:05:21 -05:00
Cydia c860a797fd Adds a Lamp Plushie 
Little lamp plushie, click clack.
 2019-01-24 22:28:28 -06:00
kiwedespars 9421535338 Merge pull request #1 from kiwedespars/minor-vog-changes 
adds bwoink and snap to vog
 2019-01-24 18:52:41 -08: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 007646d55e Merge pull request #7917 from Trilbyspaceclone/Ailurophobia 
[Ready] Adds new Ailurophobia phobia!
 2019-01-21 19:46:06 -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
CitadelStationBot 2fbe0b84d6 Automatic changelog generation for PR #7945 [ci skip] 2019-01-20 01:53:44 -06:00
deathride58 60b63aa5a3 Merge pull request #7945 from Ghommie/Ghommie-cit2 
Fixes a perpetual lack of moisture.
 2019-01-20 02:53:42 -05:00
deathride58 1a0682f942 Merge pull request #7934 from Ragolution/PrayToGreatGreenMotherEarth 
Pray to great green mother earth
 2019-01-20 02:47:23 -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
deathride58 22bc4a33f9 Merge pull request #7940 from Citadel-Station-13/kevinz000-patch-13 
Removes heirloom toolbox extra damage
 2019-01-20 02:46:40 -05:00
deathride58 4aaa4e6490 Merge pull request #7941 from BlackMajor/Shotgun-gay 
You know the compact shotgun should probably actually be compact.
 2019-01-20 02:46:19 -05:00
Jacie Thorpe ffb13d4a03 Removed Picking Zombie from Magic Mirror (#7942) 2019-01-19 15:24:45 -08:00
Ghommie 4bd1af0915 purifies /datum from this filth. 2019-01-19 00:55:15 +01:00
Ghommie 6d51dff3eb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit2 2019-01-19 00:28:24 +01:00