1bfe8bb816
love in the air
...
no not really thats actually nerve gas
2021-02-13 21:51:56 -05:00
b2917ae057
Update costumes_toys.dm
2021-02-01 06:47:59 -05:00
e9aa0f67c8
I am a wizard, not a baboon brandishing a stick.
...
Any wizard bright enough to survive for five minutes was also bright enough to realize that if there was any power in demonology, then it lay with the demons. Using it for your own purposes would be like trying to beat mice to death with a rattlesnake.
2021-01-31 21:31:57 -05:00
17b20e3a3e
Sthefo.... stepo..... steto.... ssetho.....
...
THE THING YOU LISTEN TO THE HEART WITH DAMNIT
2021-01-29 16:06:02 -05:00
0b1a40baee
that's a lot of stuff heck
2021-01-28 18:28:48 -03:00
41c87b5e85
more wood stuff
2021-01-25 17:37:06 -03:00
d71a599224
cargo stuff
2021-01-22 21:42:38 -03:00
8ece699ed9
Merge branch 'master' into punishesarchie
2021-01-19 06:30:10 -03:00
958b01f4d0
part 2
...
forgot a bunch of shit, also had to re-do parts because we don't have update_overlays()
2021-01-19 06:09:55 -03:00
9f0b22fa95
Code Cleanup + Cushions
2021-01-18 01:14:58 -07:00
b8996b962d
Merge pull request #898 from Dahlular/ikeacargo
...
REEEEEEEEEEEEEEEEEE
2021-01-17 04:24:26 -07:00
4c02fcc06f
REEEEEEEEEEEEEEEEEE
2021-01-17 04:22:20 -07:00
0fa8bff364
Merge pull request #897 from Dahlular/ikeacargo
...
Carpentry Part 1
2021-01-17 04:17:39 -07:00
30cfdc1f22
makes it fucking buyable
2021-01-17 04:12:13 -07:00
12fde70d0c
Cargo Changes Initial
2021-01-16 17:40:43 -03:00
46ffd229c9
whoops
2021-01-15 23:17:04 -07:00
bb892c90e4
New Cargo Crates, Moves Some Around
...
Diminicillin + Prospacillin cargo crates, and moves some other crates around. Removes an offensive comment.
2021-01-15 22:38:24 -07:00
403f4336db
Lotsa bus implants and ATV supply n' demand
...
Since Krav maga has an implant to toggle it on and on, I thought lets add everything else! (Aside from boxing, that for example is just tied to boxing gloves).
Also ATV's are too easy to get, make it need effort to buy and become speed racer.
2021-01-15 04:25:16 -08:00
3d46b689ac
Fix EOL issues
2021-01-14 14:54:39 -03:00
b5fe141a49
Supply Pod Code Update
2021-01-14 14:31:35 -03:00
78da9a5a12
Merge branch, update to current
2021-01-08 07:26:35 -03:00
5d80346f8f
Merge pull request #9993 from Ghommie/Ghommie-cit412
...
Ports tgstation loom changes, and durathred golems.
2021-01-05 16:54:23 -03:00
9e37d3be62
Fix merge conflicts
2021-01-05 03:41:08 -03:00
b0779fe2d7
Merge pull request #9983 from Ghommie/Ghommie-cit408
...
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2021-01-05 01:34:16 -03:00
291dcf9515
Merge pull request #10575 from Arturlang/TGUIs_Nexties
...
[TESTMERGE] Properly working TGUI Next
2021-01-04 19:47:54 -03:00
c2a937bb73
Changing Nanotrasen to Kinaris where needed
2020-12-31 17:58:25 +00:00
7fb3ed17f7
Merge pull request #755 from ArchieBeepBoop/reagentsagain
...
Ports reagents id removal and typepath usage
2020-12-23 17:48:37 +00:00
ff4d63e8e0
a sort of recipe tweak addon
2020-12-09 13:10:46 -05:00
a7c539ac32
Ports reagents id removal and typepath usage.
2020-12-09 14:32:36 -03:00
238ab653c4
Merge pull request #707 from Oposshim/another-nanotrasen-muh-lore-tweak
...
Kinaris Corp 1.1.9
2020-11-27 07:40:04 -07:00
ea1a66fd8b
Merge pull request #698 from ArchieBeepBoop/hev
...
HEV Suit Mk.I
2020-11-22 01:36:12 -07:00
e27b3b7976
Update armory.dm
2020-11-21 22:39:07 -05:00
7c91ead418
Update armory.dm
2020-11-21 22:19:16 -05:00
4679cb537f
Update armory.dm
2020-11-21 22:18:28 -05:00
7d6de4d969
Update armory.dm
2020-11-21 22:14:40 -05:00
88420d9de6
Delete armory.dm
2020-11-21 21:59:09 -05:00
bb1694f301
Kinaris Corp 1.1.2
...
another long overdue haul of shit I forgot/was to busy to get the first patch around.
2020-11-21 12:05:56 -05:00
c7db7cb2be
The ID Code Cleanup and Fixening (tm)
2020-11-20 20:55:27 -03:00
762dd621ad
HEV Suit Mk.I
2020-11-19 18:41:48 -03:00
6e989dfa51
fixes trash bag of holding bounty
2020-11-05 04:12:08 -03:00
65476a1b54
hypernob bounty
2020-11-05 03:56:37 -03:00
28cdb9c5f1
Oh no.
2020-10-30 05:30:15 -03:00
82daa9b75e
Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3
...
Adds 8 more sci crates to cargo
2020-10-28 05:52:11 -03:00
45f7b020c4
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
...
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2020-10-28 05:48:57 -03:00
4a9d6a82ce
Merge pull request #9542 from Trilbyspaceclone/patch-231
...
Lowers Cargo most packs down to Pre- MK I Cargo rework*
2020-10-28 04:57:26 -03:00
2983dfa445
Merge pull request #9211 from Trilbyspaceclone/Cargo_rebalance
...
[Atomic] Cargo rework - Mat selling nerf, addtion of grater gear to sell MK I
2020-10-28 04:39:39 -03:00
3be0cb650a
Merge pull request #607 from ArchieBeepBoop/becomemodular
...
Oh boy, it's another one of Archie's mini packs. - Energy Harvester, HoS Pet Port and a micro carp buff.
2020-10-23 16:25:53 -06:00
dc0a988d6c
Energy Harvester V1
2020-10-23 05:55:58 -03:00
cc26593463
Merge pull request #9047 from Poojawa/syntheticbloods
...
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
73aed90893
HMMMM
2020-10-09 03:19:08 -03:00
Vladin