Commit Graph
56565 Commits
Author SHA1 Message Date
Zap-zapper 906366bbf3 Size fetish update 2021-03-02 00:58:26 +07:00
NovacatandGitHub 647203adb8 Merge pull request #9821 from Heroman3003/Basic
Adds sanity check to switch eyes layer verb
2021-03-01 08:50:21 -05:00
Heroman ef7157ef93 Adds sanity check to switch eyes layer verb 2021-03-01 17:39:03 +10:00
NovacatandGitHub af90f96eed Merge pull request #9812 from Novacat/nova-basicfixes
Adds Smuggler PDA Cartridge
2021-02-28 19:31:11 -05:00
NovacatandGitHub 1c2eb7af2a Merge pull request #9818 from VOREStation/upstream-merge-7933
[MIRROR] Fix parrot runtime
2021-02-28 19:24:20 -05:00
NovacatandGitHub 55d9390dc7 Merge pull request #9817 from VOREStation/upstream-merge-7931
[MIRROR] Loot Trawler Update
2021-02-28 19:22:01 -05:00
Unknown 58e51cc184 Fixes up jobwhitelist 2021-02-28 19:21:20 -05:00
Unknown a2f1df9275 Fixes underdark stairs 2021-02-28 19:13:13 -05:00
VirgoBot ef53d5e07e Fix parrot runtime 2021-02-28 19:12:27 -05:00
Meghan-RossiandVirgoBot 5e1d3c52b0 Fix parrot runtime (#7933)
🆑
bugfix - Fixed a runtime when parrots talk over radios.
/🆑
Tested, seems to work fine.
2021-02-28 19:12:27 -05:00
VirgoBot 9a39510731 Loot Trawler Update 2021-02-28 19:11:15 -05:00
klaasjaredandVirgoBot 4c5566eb03 Loot Trawler Update (#7931)
* Loot Trawler Update

Adds new rotating sprite for Loot Trawler

* Update vending.dmi
2021-02-28 19:11:15 -05:00
Unknown 6bdbd1e0f1 Fixes something that was overlooked 2021-02-28 19:09:56 -05:00
Unknown 8e2ca21034 Merge remote-tracking branch 'VOREStation/master' into nova-basicfixes 2021-02-28 19:06:25 -05:00
NovacatandGitHub 97e92da014 Merge pull request #9816 from VOREStation/upstream-merge-7929
[MIRROR] Snow no longer goes clang and shovels are more efficient
2021-02-28 18:27:59 -05:00
NovacatandGitHub a64525866f Merge pull request #9802 from VOREStation/upstream-merge-7926
[MIRROR] Properly cleared ORGAN_CUT_AWAY for prosthetics.
2021-02-28 18:27:51 -05:00
NovacatandGitHub 538c805601 Merge pull request #9814 from VOREStation/upstream-merge-7820
[MIRROR] Adds the Restraining Bolt.
2021-02-28 18:16:22 -05:00
VirgoBot 564586fe70 Snow no longer goes clang and shovels are more efficient 2021-02-28 18:10:51 -05:00
BillyBanglesandVirgoBot 2f86e3697b snow no longer goes clang and shovels are more efficient (#7929) 2021-02-28 18:10:51 -05:00
Unknown 5c28be8c30 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7926 2021-02-28 18:08:41 -05:00
Unknown 92512f4aa7 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7926 2021-02-28 18:07:59 -05:00
NovacatandGitHub 827b30c844 Merge pull request #9787 from VOREStation/upstream-merge-7905
[MIRROR] Added verbs/handling for removing and attaching your own robotic bodyparts.
2021-02-28 18:07:37 -05:00
NovacatandGitHub 86ab510e46 Update vorestation.dme 2021-02-28 18:05:37 -05:00
MechoidandVirgoBot f5ade3682c Adds the Restraining Bolt. 2021-02-28 18:04:08 -05:00
NovacatandGitHub 7ea7566f26 Merge pull request #9799 from VOREStation/upstream-merge-7920
[MIRROR] Removes ping subsystem that was breaking chat
2021-02-28 18:01:52 -05:00
NovacatandGitHub d2d9f65a03 Update vorestation.dme 2021-02-28 17:57:38 -05:00
NovacatandGitHub d7c949c010 Update robolimbs.dm 2021-02-28 17:55:45 -05:00
Unknown 0f6022040d Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7926 2021-02-28 17:53:22 -05:00
NovacatandGitHub c0e283734d Merge pull request #9507 from VOREStation/upstream-merge-7796
[MIRROR] Adds (Follow) link to emotes for ghosts
2021-02-28 17:51:45 -05:00
NovacatandGitHub edf7931df1 Update who.dm 2021-02-28 17:50:11 -05:00
NovacatandGitHub 58dba1e323 Merge pull request #9768 from rboys2/clara-dev-peacocktail
Peacock tails!
2021-02-28 17:46:44 -05:00
NovacatandGitHub 85485c41c4 Update emote.dm 2021-02-28 17:40:21 -05:00
Unknown 098af65aa7 Adds Smuggler PDA Cartridge
-Adds Smuggler PDA Cartridge for adminbus
-Adds Bluespace Badge to loadout
2021-02-28 14:05:46 -05:00
6d063e1dd2 Apply suggestions from code review
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
2021-02-28 13:38:05 -05:00
NovacatandGitHub d0815c551b Merge pull request #9811 from Heroman3003/trash-sliems
Fixes prommies still having trashcan var on by default
2021-02-28 13:05:25 -05:00
Heroman e9431e7567 Fixes prommies still having trashcan var on by default 2021-03-01 03:52:49 +10:00
NovacatandGitHub c3bc2940d7 Merge pull request #9809 from Heroman3003/whoopsie-dwoopsie
Fixes oldchat formatting issues
2021-02-27 20:57:53 -05:00
NovacatandGitHub 3558e37a44 Merge pull request #9751 from VOREStation/upstream-merge-7864
[MIRROR] Diet/Allergy System Rework
2021-02-27 19:35:55 -05:00
Heroman b83640ab27 Fixes oldchat formatting issues 2021-02-28 10:35:55 +10:00
NovacatandGitHub 708308065d Update neutral.dm 2021-02-27 18:42:20 -05:00
NovacatandGitHub 9f15c9c298 Merge pull request #9808 from KillianKirilenko/kk-traits
More Diet/Allergy Mirror Fixes
2021-02-27 18:40:43 -05:00
Killian 82e99ab778 Update station_vr.dm 2021-02-27 23:38:21 +00:00
Killian e05436a661 morefix 2021-02-27 23:34:33 +00:00
Killian 7727c6c096 Update Chemistry-Reagents-Food-Drinks.dm 2021-02-27 22:29:44 +00:00
Killian ab8eb11be3 Update Chemistry-Reagents-Food-Drinks.dm 2021-02-27 21:21:09 +00:00
NovacatandGitHub ac4a104cee Merge pull request #9807 from KillianKirilenko/kk-traits
Diet/Allergy Conflict Resolution
2021-02-27 16:17:44 -05:00
Killian 3d8b60bc3e Merge remote-tracking branch 'upstream/upstream-merge-7864' into kk-traits 2021-02-27 20:59:29 +00:00
NovacatandGitHub 7b5b76d379 Merge pull request #8808 from KillianKirilenko/kk-misc3
FBP Munchies
2021-02-27 15:12:52 -05:00
NovacatandGitHub 2ee78f6369 Merge pull request #9510 from VOREStation/upstream-merge-7809
[MIRROR] Autochangelog fix 6
2021-02-27 15:09:59 -05:00
KillianandGitHub 0a51569694 Merge branch 'master' into kk-misc3 2021-02-27 20:01:52 +00:00