Trilbyspaceclone
6af026d160
Update emote_vr.dm
2019-09-16 14:42:02 -04:00
Hawk_v3
9e88f55480
Merge remote-tracking branch 'upstream/release'
2019-09-16 14:57:39 +01:00
Novacat
536f7a946a
Update machinery.dm
2019-09-15 23:14:03 -04:00
Heroman3003
421dbe9ab8
removes extra check
2019-09-16 13:06:49 +10:00
Heroman3003
3ef252a2b9
Fixes for real
2019-09-16 13:06:31 +10:00
Hawk-v3
b7a433f914
Merge branch 'master' into space-fox-genocide
2019-09-16 02:34:22 +01:00
Unknown
45d493c0b0
Adds bar shelter capsule to vendors
2019-09-15 21:03:58 -04:00
Novacat
d5c404927f
Merge pull request #5873 from VOREStation/upstream-merge-6455
...
[MIRROR] Properly fixes library computer runtime
2019-09-15 17:43:41 -04:00
Atermonera
8565190e87
Properly fixes library computer runtime ( #6455 )
...
* Fixes runtime in machinery/CanUseTopic() not providing correct number of arguments to ..()
* Fixes ghost interaction bug
2019-09-15 17:10:24 -04:00
Heroman
7088a5e6cc
Fixes Roiz Lizden's and Chakat Taiga's fluff items
2019-09-16 04:51:12 +10:00
Novacat
acc7f7d3e6
Merge pull request #5864 from Heroman3003/fixes2
...
Fixes more
2019-09-14 22:37:50 -04:00
Heroman
6e06dd8f32
Fixes
2019-09-15 12:29:21 +10:00
Unknown
3c4370e1d0
Fixes wrong path
2019-09-14 21:49:03 -04:00
Unknown
560c74a25e
Moves Asset protection stat changes
2019-09-14 21:45:53 -04:00
Unknown
b9c1d9b4b4
Adds ERT Janitor suit
...
Adminspawn only
2019-09-14 21:44:55 -04:00
Heroman
c92960feca
Some post-release fixes
2019-09-15 06:27:32 +10:00
Cebutris
6db6d6f0c7
deletes more KHI, reworks some wording and other corps
2019-09-14 15:13:11 -04:00
Cebutris
fd8d450258
more KHI delete
2019-09-14 13:34:23 -04:00
Cebutris
23a8a98909
delete mispelling
2019-09-14 13:31:38 -04:00
Cebutris
4346225077
delete more khi
2019-09-14 13:30:32 -04:00
Cebutris
14d6527103
delete KHI
2019-09-14 13:17:20 -04:00
Hawk_v3
a333c03a3c
Merge remote-tracking branch 'upstream/release'
2019-09-14 17:10:36 +01:00
Unknown
d4b70dd33d
Emergency Hotfix 2
2019-09-14 02:50:58 -04:00
Novacat
7f5256b4d4
Merge pull request #5855 from Novacat/nova-basicfixes
...
Emergency quick bugfixes
2019-09-14 01:48:08 -04:00
Unknown
e0a762949d
Fix Part 2
2019-09-14 01:39:06 -04:00
Novacat
013437f96f
Merge pull request #5854 from Heroman3003/prelabel
...
Fixes Blood-Onator
2019-09-14 01:20:12 -04:00
Unknown
e9c94bb553
Emergency quick bugfixes
2019-09-14 01:16:53 -04:00
Heroman
31d459f230
Fixes Blood-Onator
2019-09-14 15:01:58 +10:00
Novacat
5641105538
Merge pull request #5820 from Heroman3003/morfix3
...
Makes morphs sturdier
2019-09-14 00:41:02 -04:00
Novacat
c312973379
Merge pull request #5848 from Novacat/nova-survival
...
Protean Changes
2019-09-14 00:40:29 -04:00
Novacat
305e79db40
Merge pull request #5834 from Novacat/nova-heterochromia
...
Cargo hardsuit changes
2019-09-14 00:39:23 -04:00
Novacat
b9af72e1c8
Merge pull request #5836 from Novacat/nova-pathfinder
...
Adds rig modules to R&D
2019-09-14 00:39:13 -04:00
Novacat
396c8afdff
Merge pull request #5838 from Mewchild/MC-Sofa
...
Ports Sofas from CitRP
2019-09-14 00:39:02 -04:00
Novacat
ab256b75b3
Merge pull request #5846 from Novacat/nova-basicfixes
...
Shelter Capsule Improvements
2019-09-14 00:38:45 -04:00
Novacat
6536770991
Merge pull request #5837 from Novacat/nova-ert
...
Centcom Tweaks
2019-09-13 21:34:33 -04:00
Novacat
0e44471c07
Merge pull request #5845 from Heroman3003/remedbaying2
...
Remaps entirety of Medbay
2019-09-13 21:34:11 -04:00
Novacat
abe19fb977
Merge pull request #5840 from Mewchild/MC-FluffTab
...
Refactors Fluff Items, moves them to be loadout options
2019-09-13 20:45:01 -04:00
Unknown
ccbcdf55c0
Another all access ID removed
2019-09-13 20:34:56 -04:00
Novacat
963436e8a3
Update loadout_fluffitems_vr.dm
2019-09-13 20:17:21 -04:00
Novacat
4dbf311e51
Deletes Aronai's all access ID
2019-09-13 20:00:37 -04:00
Heroman
06d3891be2
Makes mice start with 0 nutrition
2019-09-14 07:40:15 +10:00
Unknown
f0ed9ec0a1
Darksight not valid :(
2019-09-13 16:38:05 -04:00
Unknown
33bd2e4e03
More Protean Tweaks
2019-09-13 16:23:36 -04:00
Mewchild
111d437e24
Fixes
2019-09-13 13:22:46 -05:00
Unknown
22788cedab
Protean Changes
...
- Changes Protean to Whitelist selectable
- Increases brute mod, decreases burn mod
- Halves Siemens coefficient. Zappy is still bad for Proteans, just not as bad.
I never was a fan of the 'Balance of extremes' of Proteans being near-immune to Brute and brute-related injuries, but a single shot with a laser or ion weapon practically vaporizes them.
However, Proteans are going to be problematic because they are basically Synths that get a ton of extra perks. They cannot get broken limbs, they can regenerate by just eating metal sheets, and they can get a huge number of bonuses by just eating metal sheets.
So, for that reason, some of those perks are probably going to be tweaked/reverted, and Proteans overall are going to take more brute/burn than other species in attempt to balance out those perks.
2019-09-13 13:59:18 -04:00
Unknown
1ae104f4bd
Fixes logic problems
2019-09-13 00:11:47 -04:00
Unknown
4f9fb90e90
Fixes check
2019-09-12 23:29:25 -04:00
Unknown
7fcd2e3f3f
Removes redundant code, fixes whitelists/blacklists
2019-09-12 23:23:22 -04:00
Unknown
5e2abf9fd4
This is becoming a shelter capsule PR
2019-09-12 22:50:03 -04:00
Mewchild
fbc5503bd7
Lower cases ckeys, approves Tachika's medal
2019-09-12 01:30:26 -05:00
