Commit Graph

217 Commits

Author SHA1 Message Date
Sishen
13853ac6bf removes family gavel, readds briefcase 2019-06-10 10:16:32 -04:00
kevinz000
b69986e544 Merge pull request #8514 from BurgerLUA/Arcade-Loot-Improvements
Arcade Loot Improvements + Battlemachine Tweaks
2019-06-08 03:53:13 -07:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
kevinz000
a37bf5bfaf Merge pull request #8541 from Trilbyspaceclone/patch-164
Adds implanter and implanter cases to syndie surgery bags
2019-06-08 01:21:28 -07:00
kevinz000
80aa303b4e Merge pull request #8501 from Trilbyspaceclone/boxen
Colored boxes, more box icons, and more craftable box types!
2019-06-08 01:10:11 -07:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Trilbyspaceclone
03132569a7 Update backpack.dm 2019-06-05 15:54:51 -04:00
BurgerLua
e7802a9b03 Arcade Loot Improvements 2019-06-02 02:02:47 -07:00
Trilbyspaceclone
9badda96d8 huh 2019-05-31 18:04:02 -04:00
Trilbyspaceclone
5e67974611 old file fixing 2019-05-31 18:01:22 -04:00
Trilbyspaceclone
96a32f7c3d Update boxes.dm 2019-05-31 17:53:54 -04:00
Trilbyspaceclone
5d80fb6811 Update backpack.dm 2019-05-30 15:04:45 -04:00
Trilbyspaceclone
b6590cd9e9 Update boxes.dm 2019-05-25 17:54:57 -04:00
Trilbyspaceclone
c9f6b02a0e Update briefcase.dm 2019-05-12 21:23:40 -04:00
kevinz000
9b135ed56b Merge pull request #8338 from Sishen1542/satchel-holding
Satchel of Holding!
2019-05-11 22:14:15 -07:00
Trilbyspaceclone
4c0caa3aae Update toolbox.dm 2019-05-10 14:51:49 -04:00
Sishen
c3df1b354e Satchel of holding
fashion creep
2019-05-09 20:44:07 -04:00
BurgerLua
1557c33008 Adds Penis Enlargement Pills 2019-05-02 14:55:04 -07:00
kevinz000
26c68e70d1 Merge pull request #8158 from Trilbyspaceclone/patch-86
Makes Suit miner vouchers buyable and a Miner replacement bag
2019-04-06 19:17:01 -07:00
kevinz000
b291a927f7 Merge pull request #8209 from Trilbyspaceclone/anitrad
Addtion ways to deal with radiation
2019-04-06 19:14:46 -07:00
Poojawa
d8312ec5ae Medical belt overlays + hypo storage 2019-04-04 18:38:34 -05:00
Trilbyspaceclone
9ab2bf3860 + <-- BAD 2019-04-04 16:28:18 -04:00
Trilbyspaceclone
003dd6d93d + is bad I guess 2019-04-04 15:53:36 -04:00
Trilbyspaceclone
f92ba3714d Grammar fix 2019-04-04 13:58:21 -04:00
Trilbyspaceclone
76c952cd6f Update firstaid.dm 2019-04-04 13:57:15 -04:00
Trilbyspaceclone
0baa3a1e29 Update bags.dm 2019-04-02 01:27:05 -04:00
deathride58
aa38960ab6 Update code/game/objects/items/storage/bags.dm
Co-Authored-By: Seris02 <49109742+Seris02@users.noreply.github.com>
2019-04-01 11:01:26 +08:00
Seris02
c91fd98fb0 adds bluespace bio bags 2019-03-31 15:13:01 +08:00
Trilbyspaceclone
400f955576 Update bags.dm 2019-03-24 11:21:38 -04:00
Trilbyspaceclone
d0b3b66882 Update bags.dm 2019-03-21 17:39:39 -04:00
Trilbyspaceclone
81250ae377 Merge branch 'master' into morefamstuff 2019-02-14 20:38:54 -05:00
Trilbyspaceclone
4223b4888b Yay 2019-02-14 19:38:56 -05:00
Trilbyspaceclone
7a2088aba6 Adds usefull tools/healing items to utility lockers - Requested by LeonDuvall (#7974)
* Update utility_closets.dm

* Update firstaid.dm

* Update pill.dm

* Update hypospray.dm

* Update firstaid.dm

* Update pill.dm
2019-02-13 20:46:55 -08:00
Trilbyspaceclone
ddf833d16c [Ready] Makes Adv surgery tools more common around the station! (#7938)
* Fixing updater

* Adds the belt with tools!

* Adds belt to CMO locker

* Synda bag

* Adds the medical bag to uplink

* adds in cargo crate

* Apply suggestions from code review

Rag spelling check a base line item I guess

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

* Apply suggestions from code review

Spell check Rag at it again fixing Trilbys failers

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2019-02-08 05:26:42 -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
kevinz000
651741f6f9 Update toolbox.dm 2019-01-15 19:56:47 -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
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
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
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
Poojawa
7d300117af literally everything Bhjin has been complaining about
also modularizes stuff and adds more comments. Like responsible downstream repos should have.
2018-09-18 03:59:46 -05:00
Poojawa
afac3ae0ab Merge branch 'master' into changelog-memes 2018-09-11 07:52:59 -05:00