Commit Graph

2270 Commits

Author SHA1 Message Date
nik707
aaa3b02b25 Merge pull request #7920 from deathride58/noisyflashlights
noisy flashlights - makes flashlights play a sound when toggled
2019-01-14 22:21:21 -06: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
0dc641f962 noisy flashlights - makes flashlights play a small sound when toggled on/off 2019-01-11 03:08:10 -05:00
Ragolution
821c6f9db5 Found another one.
TRILBYYYYYYYY
2019-01-10 08:51:06 -05: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
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
kevinz000
a5ba768918 Update RCD.dm 2019-01-06 01:51:47 -08:00
kevinz000
9824bdb480 Update RCD.dm 2019-01-06 01:26:59 -08:00
kevinz000
47d0cc7b1b Update implant_mindshield.dm 2019-01-04 22:02:22 -08:00
deathride58
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
kevinz000
2b2195baf5 Update glowshroom.dm 2019-01-02 07:24:37 -08:00
Trilbyspaceclone
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
deathride58
3fcedd08e9 Merge pull request #7798 from Citadel-Station-13/kevinz000-patch-18
nerfs family heirloom to not work on things above or at 18 deflection and not work on items
2018-12-20 03:24:47 -05:00
kevinz000
b079a5e8df Update toolbox.dm 2018-12-18 18:06:04 -08:00
kevinz000
1034a6ad0e ball stuff 2018-12-16 03:41:37 -08:00
Trilbyspaceclone
9961d0e321 More heirlooms! Also changes Mime/Clown's (#7793)
* More heirlooms

* Update negative.dm

WIP

* makes the knife

* dusty

* Makes everone happy

* grammer
2018-12-13 11:52:48 -08:00
kevinz000
900da0624b Update toolbox.dm 2018-12-11 01:53:27 -08: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
Redtail
4c7075f1a8 New medals added.
add:  Two new medals for engineering and medical to give out.
2018-12-08 12:12:36 -06: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
kevinz000
44d0c05100 Update toolbox.dm 2018-12-07 13:40:37 -08:00
Trilbyspaceclone
964f2f75d3 triv rethink 2018-12-06 18:39:01 -05:00
Trilbyspaceclone
5f3d9cfa7e syndicate bombs can now spawn in snack vests 2018-12-06 18:24:46 -05:00
Trilbyspaceclone
dd0dfb7517 Buffs COC and Capo sword (#7762)
* buffs COC and Capo sword

* Update misc.dm
2018-12-04 08:09:52 -08:00
nik707
8589eb3650 Merge pull request #7782 from deathride58/longbonespears
Buffs bone spears by increasing their reach to 2 whole tiles
2018-12-03 09:54:39 -06:00
nik707
036757488d Merge pull request #7783 from R3dtail/new_carpet
Added a new carpet
2018-12-02 21:52:03 -06:00
Redtail
e339bcd2ca Added a new carpet
Worked on adding a new carpet.  It isn't -finished- yet and Trilby is going to help look over what I've done so I can make this work.
2018-12-01 20:21:18 -06:00
deathride58
fd000f7fb8 makes bone spears capable of reaching two whole tiles! 2018-11-30 21:41:19 -05:00
deathride58
d9b6979dff Merge pull request #7761 from Trilbyspaceclone/patch-11
Buffs Highlander stam
2018-11-25 07:18:27 -05:00
deathride58
0be6ce420a Merge pull request #7757 from Trilbyspaceclone/patch-9
Wallets can now hold valentine cards
2018-11-25 07:17:49 -05:00
Trilbyspaceclone
b0a9bab300 Buffs Highlander stam 2018-11-24 00:09:41 -05:00
nik707
fd2e9ad5c0 Merge pull request #7753 from Trilbyspaceclone/Trilbyspaceclonepatch-6
Makes skeletal no longer KPA proof, but Pirate skeletal are still do to being Free or something
2018-11-23 15:12:19 -06:00
Trilbyspaceclone
12e43ea5f3 Update wallets.dm 2018-11-21 02:44:59 -05:00
Trilbyspaceclone
5435fa4cba make triv rethink 2018-11-21 02:44:49 -05:00
Trilbyspaceclone
e5a0b8d677 Wallets can hold valentine cards 2018-11-21 02:00:23 -05:00
Trilbyspaceclone
f3f314ea6e Yarr 2018-11-20 20:05:31 -05:00
nik707
b76bb57609 Merge pull request #7734 from deathride58/fancylightingwave2
Fancy lighting wave 2 - nonbinary colored lighting now applies to gun/helmet flashlights, borgs, bots, welders, and more
2018-11-19 18:05:27 -06:00
deathride58
660bb679af Merge pull request #7716 from Citadel-Station-13/kevinz000-patch-7
cuts glowshroom maximum structural health by 7
2018-11-16 23:20:16 -05:00
deathride58
9390707bfe 200 iq 2018-11-16 22:26:35 -05:00
deathride58
621b0675e9 Fancy lighting wave 2 - expands nonbinary colored lighting to more than just flashlights and lights 2018-11-16 21:12:07 -05:00
deathride58
402a5ba9e4 Makes it plausible to join as ghost roles from the latejoin menu (#7726)
* Makes it plausible to join as ghost roles from the latejoin menu

* Clarifies a little bit of the text
2018-11-16 14:47:42 -08:00
kevinz000
14e654ac45 Update glowshroom.dm 2018-11-11 17:28:11 -08:00
Trilbyspaceclone
b745f56eeb [Ready] Makes PDA notes have basic ship terms that relate to the NSEW form PFBSQ (#7690)
* I thought you said weast

* Weh

* Update code/game/objects/items/devices/PDA/PDA.dm

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2018-11-09 19:09:54 -08:00
deathride58
7cb54b0564 Merge pull request #7696 from ursamedium/manualmirror
Mirror of tg's new gas sprites
2018-11-06 02:07:35 -05:00
deathride58
40dd962a16 Adds a non-vore variant for the medihound sleeper, replaces "Allow medihound sleeper" pref with "Voracious medihound sleepers" pref (#7659)
* The medihound sleeper pref no longer disables use of the medihound sleeper, but rather determines the voracious hound sleeper sprite/flavortext

* Axes stray north/south belly sprites in the nonvore variants
2018-11-02 12:53:11 -07:00
Bear
c6ce774327 what a gas 2018-11-01 22:35:18 -04:00
deathride58
4c19f4a50a you're too exhausted to be lifted up - makes it much harder to force someone to stand if they're in hard stamcrit (#7683) 2018-10-30 19:29:08 -07:00
Tupinambis
db74ad4361 Fixes 2018-10-27 23:39:09 -05:00
Tupinambis
2e0cb266de Makes all ion references to "humans" reference to "crew" instead. 2018-10-27 21:01:03 -05:00