Unknown
a5f3776a91
adds _vr to trash pile
2020-02-17 00:01:50 -05:00
Unknown
b5f337a3b0
Replaces Tramadol maint pills with Paracetamol
2020-02-16 10:54:55 -05:00
Novacat
4f4a29b5fc
Merge pull request #6568 from VOREStation/stream
...
Remove use of <<
2020-02-14 09:34:12 -05:00
Heroman3003
718feb1ebe
Adds pineapple pizzabox ( #6682 )
2020-02-13 17:11:43 -05:00
Arokha Sieyes
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
Novacat
06b7651799
Update nanopaste.dm
2020-02-10 18:59:12 -05:00
Atermonera
6374108fa2
Applies same restrictions as first aid to external synth repair
2020-02-10 18:53:31 -05:00
Heroman3003
0d21e91b68
Merge branch 'master' into belt-mining
2020-02-10 22:47:42 +10:00
Atermonera
0bbc8109ae
Merge pull request #6675 from GeneriedJenelle/patch-1
...
Logs graffiti and crayon drawings: Non-Cursed PR
2020-02-09 23:45:06 -05:00
Atermonera
7b20362aaf
Merge pull request #6662 from Shadow-Quill/Baton-Intent-Change
...
Stunbatons will now only harmbaton on grab/harm intents
2020-02-09 14:47:00 -05:00
Novacat
22c0fd363f
Update bed.dm
2020-02-08 15:56:26 -05:00
Meghan-Rossi
3935aa3e47
fix conflict causing compile error
2020-02-08 19:32:03 +00:00
Atermonera
c9e3257d17
2020 Civilian Wing Overhaul
2020-02-08 13:56:05 -05:00
Novacat
bd2b049c74
Merge pull request #6543 from Heroman3003/taurlocator
...
Also applies taur riding teleport limitation to translocators
2020-02-07 23:05:38 -05:00
Heroman
b8c07ae29b
Also applies taur riding teleport limitation to translocators
2020-02-08 13:35:41 +10:00
Heroman
8e26511aa1
Prevents some teleporting abuses with taur riding
2020-02-08 07:45:53 +10:00
Arokha Sieyes
3c5cfa838d
Update sleevemate warning message
2020-02-04 20:16:13 -05:00
Atermonera
1f227a9b55
Merge pull request #6664 from PrismaticGynoid/loadouttoys
...
Adds some toys to the loadout
2020-02-03 20:50:45 -05:00
Atermonera
80ec8ac200
Merge pull request #6656 from Amunak/countable-lists
...
Prettifies closet contents list with (newly added) countable variant of english_list
2020-02-01 18:01:23 -05:00
Heroman
38bf0a33c6
Fixes and re-implements Rogue Mining (Belt Mining)
2020-01-23 18:43:20 +10:00
Atermonera
908489b1bd
Merge pull request #6640 from TheFurryFeline/patch-5
...
Aaaa, typo fixy
2020-01-21 18:14:22 -05:00
Novacat
1688d86772
Merge pull request #6478 from VOREStation/upstream-merge-6621
...
[MIRROR] Moar descriptions for things
2020-01-21 01:33:06 -05:00
Novacat
7b815bd594
Update radio.dm
2020-01-21 01:23:57 -05:00
Atermonera
d10a72a77f
Adds a mega cooking recipe
2020-01-20 23:15:01 -05:00
Atermonera
9b93339969
Moar descriptions for things
2020-01-20 22:50:39 -05:00
Novacat
708e0b477e
Merge pull request #6463 from VOREStation/upstream-merge-6619
...
[MIRROR] Can now (de)construct chem masters
2020-01-15 23:35:39 -05:00
Atermonera
7ae5204eaf
Merge pull request #6619 from Shadow-Quill/Chem-Master-Building
...
Can now (de)construct chem masters
2020-01-15 23:16:19 -05:00
Atermonera
c50ef77161
Merge pull request #6612 from Shadow-Quill/PDA-Ctrl-Click
...
Ctrl+Click now removes pens from PDAs
2020-01-15 23:08:06 -05:00
Unknown
d3aa3bed3c
Removes gnomes
...
https://cdn.discordapp.com/attachments/173832207784214528/666485419747180554/7f1b99fdd795299aabd6ddef202ecf98.png
This is why we cannot have nice things.
2020-01-13 22:49:15 -05:00
Heroman
f032c80486
Also buffs vore laws chance for lost voreborgs
2020-01-13 17:55:00 +10:00
Novacat
c7b689246d
Merge pull request #6423 from drexample/WE-ALWAYS-DELIVER
...
DO YOU NEED A SLICE OF JOY IN YOUR LIFE?
2020-01-12 22:14:17 -05:00
Novacat
105f13e03c
Merge pull request #6424 from drexample/gnot-sure
...
You've been gnomed.
2020-01-12 22:02:41 -05:00
Heroman
06b5064a8e
Makes drone pods remain active after first attempt, allowing a ghost to click on it to enter
2020-01-13 07:21:48 +10:00
drexample
041db96898
WE ALWAYS DELIVER
2020-01-11 23:22:18 +03:00
drexample
1be4fe8b3c
hooh
2020-01-11 06:42:54 +03:00
drexample
747114793c
WE ALWAYS DELIVER!
2020-01-11 05:28:00 +03:00
Heroman
b5f0e0affe
Fixes wrong gasmask in xenoflorist locker
2020-01-11 10:39:08 +10:00
Heroman3003
5f05d26eb9
Merge branch 'master' into resleeving_sickness
2020-01-10 09:43:42 +10:00
Heroman
a9c1f48a93
Adds a single cure pill to vault, doubles amount ERT gets, changes taste
2020-01-10 09:31:51 +10:00
Mechoid
ec5e851399
Xenoflora expansion take2
2020-01-08 13:46:25 -05:00
Heroman
e05fdf6258
Fixes clamp issues
2020-01-06 08:37:27 +10:00
Heroman
9490261230
Adds Kitsuhanan Cure for resleeving sickness
2020-01-06 07:15:13 +10:00
Mechoid
c3079004ea
GameMaster Tuning ( #6593 )
...
* Actually Game Master but I am an idiot.
2020-01-05 01:39:28 -05:00
lbnesquik
e772c1a09b
Add ambrosia seed as a somewhat rare loot for trash.
...
Why is this good:
- Low level illegal stuff to do
- I can make my pothead characters
- This is like the most common illegal drug ever, so having it being harder to get than size guns or basically anything in R&D is weird.
- What are you going to do with weed besides smoke it anyway?
2020-01-03 22:47:32 +01:00
lbnesquik
377723bcf4
Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes
2019-12-30 09:09:51 +01:00
Heroman
572112d28b
Fixes AI not being able to resist out of nets
2019-12-29 08:33:10 +10:00
lbnesquik
562df07602
Move the lance sprite to weapons_vr.dmi.
2019-12-26 07:25:49 +01:00
lbnesquik
eace084579
Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes
2019-12-26 07:25:05 +01:00
lbnesquik
ae398259ea
Introduce more taur clothes.
...
- Add medieval style barding for centaurs.
- Add full body options for wolf taurs. (Fat sprites slightly break this)
- Cloak for Drakes
- Botany Apron should work for the majority of taurs and not weirdly cut at the middle.
- WIP lance
2019-12-25 20:40:21 +01:00
Cerebulon
183b1d99b1
Coffee Shop Revamp
2019-12-22 22:54:01 -05:00