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
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
ab5681e3c8
Update brand_intelligence.dm
2019-01-10 03:00:40 -08:00
ae8b026cf2
Update packs.dm
2019-01-08 15:17:02 -05:00
7e8ba9a23c
[Ready] New adv surgery tools! ( #7879 )
...
* Fixing updater
* Update tools.dm
* Update all_nodes.dm
* Update medical_designs.dm
* shit.jpg
* Update medical_designs.dm
* Update medical_designs.dm
* Apply suggestions from code review
Ragolutions' Grammar rework
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com >
* Apply suggestions from code review
Reg being the best
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com >
* Huh
2019-01-08 02:36:43 -08:00
c96b6dfee8
[Ready] Hunting, Anitviro and Russian gear crate! ( #7796 )
...
* Cargo
* grammar
* Update packs.dm
* reduce anitviro crate cost
* No fun allowed
* Update packs.dm
2019-01-08 02:35:41 -08:00
6701585888
Update snack.dm ( #7899 )
2019-01-08 02:35:19 -08:00
353713fcee
ERT suits shouldnt die to acid ( #7897 )
2019-01-08 02:30:47 -08:00
c2eafa3f73
Adds condiments to the coffie vender with coins! ( #7902 )
...
* Update coffee.dm
* Update coffee.dm
* Would help to double check
2019-01-08 02:28:24 -08:00
31babed81e
Merge pull request #7885 from Citadel-Station-13/kevinz000-patch-1
...
Frying things that are not food now gives a random bad chemical picked from food poisoning, chlorine trifluoride, and a host of fun chemicals include a potent stimulant that suffocates you.
2019-01-06 14:27:41 -06:00
8996066c75
Merge pull request #7886 from Citadel-Station-13/kevinz000-patch-2
...
adds pitch settings to playsound
2019-01-06 14:27:27 -06:00
e3732519d9
Merge pull request #7887 from Citadel-Station-13/kevinz000-patch-4-1
...
Fixes cooking oil oversight
2019-01-06 14:27:10 -06:00
3ae46ba2da
Moves RCLD to a proper place
2019-01-06 04:27:06 -05:00
277b589f1f
Update weapon_designs.dm
2019-01-04 03:44:47 -08:00
302f8f00f4
Update tomato.dm
2019-01-04 00:42:29 -08:00
b365db114f
Update food_reagents.dm
2019-01-03 08:32:12 -08:00
71cf822138
Update snacks_bread.dm
2019-01-03 08:19:06 -08:00
6dfd0ab32d
Update playsound.dm
2019-01-03 08:10:24 -08:00
a1836c98af
Update snacks_bread.dm
2019-01-03 07:37:04 -08:00
bacb74ad47
Update snacks_bread.dm
2019-01-03 07:34:09 -08:00
e9ce54e397
Update snacks_bread.dm
2019-01-03 07:32:39 -08:00
4c904ee5e6
Merge pull request #7846 from Citadel-Station-13/sdql2
...
SDQL2 upgrades!
2019-01-03 08:00:15 -05:00
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
2d01ac3604
Merge pull request #7868 from Citadel-Station-13/kevinz000-patch-4
...
fixes neurotoxin properly
2019-01-03 07:47:34 -05:00
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
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
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
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
a2ba37d664
Update all_nodes.dm ( #7864 )
2019-01-03 04:44:00 -08:00
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
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
09df2edf25
Update uplink_items.dm ( #7877 )
2019-01-03 04:36:52 -08:00
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
ba24207f86
Update devil.dm
2019-01-01 00:06:13 -08:00
c620beec65
Update ninja_event.dm
2019-01-01 00:05:53 -08:00
f140d56b43
Update coil.dm
2018-12-31 23:41:01 -08:00
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
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
8bada7f961
Update human_defense.dm
2018-12-30 22:23:13 -08:00
5c3eb5b00e
Update neurotoxin.dm
2018-12-30 22:22:45 -08:00
6fbf3e07fe
Merge pull request #7845 from Trilbyspaceclone/patch-30
...
Makes Bio suits = to Rad suits.
2018-12-25 02:23:46 -06:00
0fff94b4f7
Merge pull request #7847 from Citadel-Station-13/kevinz000-patch-3-1
...
fix xenos 2
2018-12-25 02:22:11 -06:00
0d78a109f6
Update human_defense.dm
2018-12-24 01:52:24 -08:00
96b4171044
Update neurotoxin.dm
2018-12-24 01:52:08 -08:00
502fb7cec8
Update SDQL_2.dm
2018-12-23 20:44:50 -08:00
d7397d5019
Update SDQL_2.dm
2018-12-23 20:44:32 -08:00
81f5bfa861
Update SDQL_2.dm
2018-12-23 20:34:22 -08:00
b40e1cd731
Update SDQL_2_parser.dm
2018-12-23 20:18:37 -08:00
34c8613681
Update SDQL_2.dm
2018-12-23 18:20:03 -08:00
03b88acbdb
Update SDQL_2.dm
2018-12-23 18:19:21 -08:00
deathride58