Novacat
|
34c8458714
|
Merge pull request #6678 from VOREStation/upstream-merge-6722
[MIRROR] Fixes MCs not being rechargable
|
2020-02-24 21:13:21 -05:00 |
|
Novacat
|
ab9f71f1a5
|
Update recharger.dm
|
2020-02-24 20:29:04 -05:00 |
|
Novacat
|
c545032a5f
|
Merge pull request #6677 from VOREStation/upstream-merge-6737
[MIRROR] Makes pen click when you click on them
|
2020-02-24 20:28:15 -05:00 |
|
Novacat
|
c93c572c52
|
Merge pull request #6675 from VOREStation/upstream-merge-6731
[MIRROR] Adds individual modular armour crates, tweaks old prices
|
2020-02-24 20:27:43 -05:00 |
|
Novacat
|
8206949d15
|
Merge pull request #6674 from VOREStation/upstream-merge-6734
[MIRROR] Removes deadringer cloak exploit
|
2020-02-24 20:27:10 -05:00 |
|
Novacat
|
b633165a08
|
Merge pull request #6673 from VOREStation/upstream-merge-6730
[MIRROR] Fixes sprites for Ablative & Bulletproof modular armour
|
2020-02-24 20:26:51 -05:00 |
|
Novacat
|
650007f9e7
|
Merge pull request #6672 from VOREStation/upstream-merge-6729
[MIRROR] Fix and tweak station Railguns.
|
2020-02-24 20:26:32 -05:00 |
|
Novacat
|
993f559ac0
|
Merge pull request #6671 from VOREStation/upstream-merge-6727
[MIRROR] Adds a *dwoop emote
|
2020-02-24 20:26:15 -05:00 |
|
Novacat
|
97b86d4d1d
|
Merge pull request #6670 from VOREStation/upstream-merge-6726
[MIRROR] Adds holster, lighter, and seatbelt sounds from World Server.
|
2020-02-24 20:25:57 -05:00 |
|
Novacat
|
3ba600c785
|
Merge pull request #6669 from VOREStation/upstream-merge-6723
[MIRROR] Creates a preference for precise item placement
|
2020-02-24 20:25:39 -05:00 |
|
Novacat
|
351b74aeaa
|
Merge pull request #6668 from VOREStation/upstream-merge-6720
[MIRROR] Helmet Camera Moved Tabs
|
2020-02-24 20:25:21 -05:00 |
|
Novacat
|
d4a8a9332b
|
Merge pull request #6666 from VOREStation/upstream-merge-6718
[MIRROR] Added two chemical spill PoIs + More Immersive PoI Names
|
2020-02-24 20:24:35 -05:00 |
|
Novacat
|
f4ce5b417f
|
Merge pull request #6665 from VOREStation/upstream-merge-6683
[MIRROR] Implements blacklist for specific plant sprites for random seeds
|
2020-02-24 20:24:05 -05:00 |
|
Novacat
|
d3cd40d147
|
Merge pull request #6664 from VOREStation/upstream-merge-6701
[MIRROR] Hide items in plant pots and plushies
|
2020-02-24 20:23:47 -05:00 |
|
Leshana
|
e7700b7af0
|
Fixed conflicts near a vorestation edit
|
2020-02-24 19:15:09 -05:00 |
|
Leshana
|
8d8284a2b3
|
Resolved conflicts
|
2020-02-24 19:09:53 -05:00 |
|
Atermonera
|
b353ec7d01
|
Fixes MCs not being rechargable
|
2020-02-24 16:25:34 -05:00 |
|
Atermonera
|
cc487ceebf
|
Merge pull request #6737 from listerla/penclick
Makes pen click when you click on them
|
2020-02-24 16:20:09 -05:00 |
|
Atermonera
|
138fe4053b
|
Merge pull request #6731 from FenodyreeAv/CargoChange
Adds individual modular armour crates, tweaks old prices
|
2020-02-24 16:17:41 -05:00 |
|
Atermonera
|
0baec55043
|
Merge pull request #6734 from VOREStation/pol-dead
Removes deadringer cloak exploit
|
2020-02-24 16:17:31 -05:00 |
|
Atermonera
|
ceae103174
|
Merge pull request #6730 from FenodyreeAv/TestBranch
Fixes sprites for Ablative & Bulletproof modular armour
|
2020-02-24 16:16:18 -05:00 |
|
Atermonera
|
55704e0760
|
Merge pull request #6729 from Mechoid/RailgunFixxo
Fix and tweak station Railguns.
|
2020-02-24 16:15:04 -05:00 |
|
Atermonera
|
940ca147be
|
Merge pull request #6727 from listerla/dwoop
Adds a *dwoop emote
|
2020-02-24 16:13:50 -05:00 |
|
Atermonera
|
16183867df
|
Adds holster, lighter, and seatbelt sounds from World Server.
|
2020-02-24 16:12:37 -05:00 |
|
Atermonera
|
89a32f867f
|
Merge pull request #6723 from Heroman3003/placementpref
Creates a preference for precise item placement
|
2020-02-24 16:10:22 -05:00 |
|
Atermonera
|
e168c13c11
|
Merge pull request #6720 from Nalarac/helmet-cameras
Helmet Camera Moved Tabs
|
2020-02-24 16:09:05 -05:00 |
|
Atermonera
|
5e2a692610
|
Added two chemical spill PoIs + More Immersive PoI Names
|
2020-02-24 16:02:31 -05:00 |
|
Atermonera
|
7006fc6fb1
|
Implements blacklist for specific plant sprites for random seeds
|
2020-02-24 16:02:21 -05:00 |
|
Atermonera
|
b26daf5fb1
|
Hide items in plant pots and plushies
|
2020-02-24 16:01:08 -05:00 |
|
Atermonera
|
c1fe64ba6a
|
Merge pull request #6717 from LeighKnapenberger/master
Fixes Mint Apple Sparkle having a recipe, but no drink
|
2020-02-24 16:00:57 -05:00 |
|
Novacat
|
bfa123c1f0
|
Merge pull request #6661 from Heroman3003/sofafix
Makes all sofa colors/subtypes makeable
|
2020-02-24 03:35:07 -05:00 |
|
Heroman
|
726664f6f0
|
Makes all sofa colors/subtypes makeable
|
2020-02-24 18:19:56 +10:00 |
|
Heroman
|
a5653c6eb2
|
Better fix for the missing accessories on taurs
|
2020-02-24 17:39:21 +10:00 |
|
Novacat
|
fe844b4d9d
|
Merge pull request #6659 from Heroman3003/idfix2
Fixes IDs being dropped from cryopods
|
2020-02-23 20:27:10 -05:00 |
|
Heroman3003
|
b12348f909
|
Merge branch 'master' into maint_pred
|
2020-02-24 11:00:59 +10:00 |
|
Heroman
|
7c2e86f90f
|
Fixes IDs being dropped from cryopods
|
2020-02-24 10:03:35 +10:00 |
|
Novacat
|
6db588e80d
|
Merge pull request #6658 from Heroman3003/cloakfix
Fixes cloaks being broken on taurs.
|
2020-02-23 19:02:20 -05:00 |
|
Heroman
|
518ccfab5b
|
Fixes cloaks being broken on taurs.
|
2020-02-24 08:47:31 +10:00 |
|
Novacat
|
4d1a63618c
|
Merge pull request #6653 from VOREStation/upstream-merge-6728
[MIRROR] Carbon mobs can be attacked again
|
2020-02-23 00:53:20 -05:00 |
|
Leshana
|
3c03a71107
|
Investigate what causes us to bail out early when timer system breaks.
|
2020-02-23 00:42:56 -05:00 |
|
Atermonera
|
89e23b3218
|
Carbon mpbs can be attacked again (#6728)
|
2020-02-22 23:14:03 -05:00 |
|
Novacat
|
d247f88329
|
Merge pull request #6651 from VOREStation/upstream-merge-6710
[MIRROR] Ports precision placement of items
|
2020-02-22 10:33:58 -05:00 |
|
Novacat
|
6385766328
|
Update living.dm
|
2020-02-22 09:50:36 -05:00 |
|
Atermonera
|
11eed81b92
|
Ports precision placement of items
|
2020-02-22 02:35:41 -05:00 |
|
Atermonera
|
41f111ea54
|
Merge pull request #6697 from Heroman3003/scannerfix1
Fixes missing sprites on forensic scanner
|
2020-02-22 02:17:23 -05:00 |
|
Trexdude
|
790d6552f3
|
Fixes BL-3 Sprite
Such that it appears as a sprite, and not a debug invisible sprite.
|
2020-02-21 11:46:23 -05:00 |
|
Novacat
|
b0c6118a52
|
Merge pull request #6638 from VOREStation/upstream-merge-6714
[MIRROR] Renames Make All Areas (Un)Powered secret
|
2020-02-21 10:37:48 -05:00 |
|
Novacat
|
aea99134e6
|
Merge pull request #6636 from VOREStation/upstream-merge-6709
[MIRROR] [Bugfix?] Bat Attack Spelling Fixy
|
2020-02-21 10:37:31 -05:00 |
|
Atermonera
|
a54a7912cb
|
Merge pull request #6714 from Heroman3003/verbrename
Renames Make All Areas (Un)Powered secret
|
2020-02-21 02:27:08 -05:00 |
|
Atermonera
|
9029bcc85e
|
Merge pull request #6709 from TheFurryFeline/patch-6
[Bugfix?] Bat Attack Spelling Fixy
|
2020-02-21 02:14:18 -05:00 |
|