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
64d1c3d67d
Merge pull request #7910 from Citadel-Station-13/revert-7858-patch-35
...
Revert "[Ready] Makes synda paper mask correct eye sight and flash proof"
2019-01-12 01:13:19 -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
deathride58
a8ecd768dd
Merge pull request #7900 from Citadel-Station-13/kevinz000-patch-16
...
Buffs the shit out of the RLD (4x material, view --> range)
2019-01-12 01:11:18 -05:00
deathride58
3f67728fca
Merge pull request #7898 from Citadel-Station-13/kevinz000-patch-15
...
Adminwalls now have INFINITY explosion block
2019-01-12 01:10:39 -05:00
deathride58
201026a6e5
Merge pull request #7913 from Ragolution/TrilbyTraitTypos
...
Grammar adjusts for negative traits.
2019-01-12 01:09:07 -05:00
Ragolution
821c6f9db5
Found another one.
...
TRILBYYYYYYYY
2019-01-10 08:51:06 -05:00
kevinz000
ab5681e3c8
Update brand_intelligence.dm
2019-01-10 03:00:40 -08:00
Ragolution
f981618f7e
oops
2019-01-09 17:21:58 -05:00
Ragolution
ff51bf470f
git still being weird
2019-01-09 10:10:44 -05:00
Ragolution
7cca2e7fe9
uhhh
...
is this something that should be done because i have no idea
2019-01-09 10:08:34 -05:00
Ragolution
39d75b93b1
Git acting fucky
2019-01-09 09:43:24 -05:00
Ragolution
ae94b2378a
Merge branch 'master' into TrilbyTraitTypos
2019-01-09 09:41:52 -05:00
Ragolution
ecf2ed5639
Grammar adjusts for negative traits.
...
Improves grammar, spelling and legibility for Mute and Phobia traits. Also adds verbosity for their descriptions and acquisition/loss messages.
2019-01-09 09:36:16 -05:00
Trilbyspaceclone
ae8b026cf2
Update packs.dm
2019-01-08 15:17:02 -05:00
kevinz000
4a50b86b47
Revert "[Ready] Makes synda paper mask correct eye sight and flash proof ( #7858 )"
...
This reverts commit 2b68547f8d .
2019-01-08 10:09:48 -08:00
Trilbyspaceclone
2b68547f8d
[Ready] Makes synda paper mask correct eye sight and flash proof ( #7858 )
...
* Wow this is worthless
* Better tells
2019-01-08 02:41:12 -08:00
Trilbyspaceclone
889216c8f6
[Ready] New Mute quirk as well as Paper bin and crayon box to load-outs! - Requested by Suru ( #7867 )
...
* Fixing updater
* Update negative.dm
* Update backpack.dm
* Update negative.dm
* Update negative.dm
2019-01-08 02:38:54 -08:00
Trilbyspaceclone
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
Trilbyspaceclone
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
Trilbyspaceclone
6701585888
Update snack.dm ( #7899 )
2019-01-08 02:35:19 -08:00
Trilbyspaceclone
353713fcee
ERT suits shouldnt die to acid ( #7897 )
2019-01-08 02:30:47 -08:00
Ignari-Coldstorm
eb7f5634d5
Changes Jukebox Availability ( #7905 )
...
Changes the massive price of the jukebox to something much more affordable, as well as broadens access needed to use it.
2019-01-08 02:30:24 -08:00
Trilbyspaceclone
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
Trilbyspaceclone
2e0e115b24
Adds 6 new colors to the unlimited paint chaining can ( #7903 )
...
* Update paint.dm
* I did this by hand and not Copy pasted, go me
2019-01-08 02:28:05 -08:00
CitadelStationBot
01c862eb38
Automatic changelog generation for PR #7860 [ci skip]
2019-01-06 14:31:46 -06:00
nik707
f30f787ccf
Merge pull request #7860 from deathride58/fixessyndiemasks
...
fixes the syndicate mask
2019-01-06 14:31:44 -06:00
nik707
c5dc2b8762
Merge pull request #7883 from Citadel-Station-13/kevinz000-patch-12
...
Glowshroom spread nerf/bugfix only it compiles
2019-01-06 14:28:06 -06:00
nik707
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
nik707
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
nik707
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
nik707
c4823cbeb0
Merge pull request #7892 from Citadel-Station-13/kevinz000-patch-9
...
Who the hell spells "Cryostasis" "Cryostatis"
2019-01-06 14:25:26 -06:00
nik707
edc48cf56a
Merge pull request #7893 from Citadel-Station-13/kevinz000-patch-14
...
Fixes mindshield bug
2019-01-06 14:24:51 -06:00
nik707
286e0bcb5b
Merge pull request #7894 from Citadel-Station-13/donatoroveralls
...
mime overalls - donator
2019-01-06 14:24:26 -06:00
kevinz000
a5ba768918
Update RCD.dm
2019-01-06 01:51:47 -08:00
Trilbyspaceclone
3ae46ba2da
Moves RCLD to a proper place
2019-01-06 04:27:06 -05:00
kevinz000
9824bdb480
Update RCD.dm
2019-01-06 01:26:59 -08:00
kevinz000
eada20a1d9
Update closed.dm
2019-01-05 23:14:29 -08:00
LetterJay
87dee7ff83
mime overalls - donator
2019-01-05 11:01:21 -06:00
kevinz000
47d0cc7b1b
Update implant_mindshield.dm
2019-01-04 22:02:22 -08:00
kevinz000
277b589f1f
Update weapon_designs.dm
2019-01-04 03:44:47 -08:00
nik707
17a9099faa
Merge pull request #7891 from Citadel-Station-13/kevinz000-patch-8
...
speedmerged cus important fix
2019-01-04 03:10:49 -06:00
kevinz000
302f8f00f4
Update tomato.dm
2019-01-04 00:42:29 -08:00
Lasshy KorshBot
e6b9c9c441
Adds a squeak emote ( #7871 )
...
* Adds a squeak emote
Adds a cute squeak for insects
* Update cit_emotes.dm
* tabbed up last line, changed emote message.
* Changed spaces from tabs, fixed compiling issues
I don't know why they were spaces, should fix Compiling issues
* Fixed tab stuff AGAIN
Compiling should work now??
* Made audio file louder
It was too quiet
* Delete mothsqueak.ogg
* Fixed the audio on the .ogg
was too quiet
* Fixed / at the end and removed if human
* fixed indentation stuff again again
2019-01-03 08:40:43 -08:00
kevinz000
b365db114f
Update food_reagents.dm
2019-01-03 08:32:12 -08:00
kevinz000
71cf822138
Update snacks_bread.dm
2019-01-03 08:19:06 -08:00
kevinz000
6dfd0ab32d
Update playsound.dm
2019-01-03 08:10:24 -08:00
kevinz000
a1836c98af
Update snacks_bread.dm
2019-01-03 07:37:04 -08:00